Merge "Fix spelling error, and add uWSGI stats server support."

This commit is contained in:
Jenkins 2013-10-23 23:40:59 +00:00 committed by Gerrit Code Review
commit ced5057abb
3 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,6 @@ Barbican is part of a set of applications that make up the CloudKeep ecosystem.
* [Postern](https://github.com/cloudkeep/postern) - Go based agent that provides access to secrets from the Barbican API.
* [Palisade](https://github.com/cloudkeep/palisade) - AngularJS based web ui for the Barbican API.
* [Python-barbicanclient](https://github.com/cloudkeep/python-barbicanclient) - A convenient Python-based library to interact with the Barbican API.
* [Keep](https://github.com/cloudkeep/keep) - A python-based command line client for the Barbican API.
Additional documentation can be found on the [Github Wiki](https://github.com/cloudkeep/barbican/wiki). For questions, comments or concerns, hop on the OpenStack dev mailing list at `openstack-dev@lists.openstack.org` and let us know what you think, just add `[openstack-dev][barbican]` to the subject. You can also join our Freenode IRC at `#openstack-cloudkeep`.
@ -17,7 +16,7 @@ Additional documentation can be found on the [Github Wiki](https://github.com/cl
## Why Should You Use Barbican?
The current state of key management is atrocious. While Windows does have some decent options through the use of the Data Protection API (DPAPI) and Active Directory, Linux lacks a cohesive story around how to manage keys for applicaiton use.
The current state of key management is atrocious. While Windows does have some decent options through the use of the Data Protection API (DPAPI) and Active Directory, Linux lacks a cohesive story around how to manage keys for application use.
Barbican was designed to solve this problem. The system was motivated by internal Rackspace needs, requirements from [OpenStack](http://www.openstack.org/) and a realization that the current state of the art could use some help.

View File

@ -23,7 +23,7 @@ then
PKG_DIR=$PWD/etc/$PKG
CONF_FILE=./etc/$PKG/barbican-api.conf
PYTHONPATH=$VENV_PYTHON:$PYTHONPATH
OPTS='-H '$VENV_HOME/$VENV
OPTS='-H '$VENV_HOME/$VENV' --stats :9314'
# Copy conf file to home directory so oslo.config can find it
LOCAL_CONF_FILE=~/barbican-api.conf
@ -49,4 +49,4 @@ fi
echo 'Running Barbican uWSGI Emperor '$PKG_DIR/vassals
echo 'Executing uwsgi with these options: '$PKG_DIR/vassals' '$OPTS
uwsgi --master --emperor $PKG_DIR/vassals $OPTS
uwsgi --master --emperor $PKG_DIR/vassals $OPTS

View File

@ -5,6 +5,7 @@ description "Barbican Key Management APIs"
start on runlevel [2345]
stop on runlevel [06]
#TODO(jwood) Parameterize the stats port address.
script
uwsgi --master --die-on-term --emperor /etc/barbican/vassals --logto /var/log/barbican/barbican-api.log
uwsgi --master --die-on-term --emperor /etc/barbican/vassals --logto /var/log/barbican/barbican-api.log --stats :9314
end script