From 2f874cda58e41f891a278f42b51d52dc4b98cabe Mon Sep 17 00:00:00 2001 From: jfwood Date: Tue, 22 Oct 2013 17:27:26 -0500 Subject: [PATCH] Fix spelling error, and add uWSGI stats server support. Nick Bimpasis found a spelling error with our README.md file, which this change request fixes. I've also added support the the uWSGI stats server, which is required to provide New Relic support for uWSGI monitoring. Change-Id: Ie545581f9aa7c5a277336c71e56c5350fc47493f --- README.md | 3 +-- bin/barbican-all | 4 ++-- etc/init/barbican-api.conf | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 52418906b..e405ca334 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/bin/barbican-all b/bin/barbican-all index 32225fa49..111cc5acd 100755 --- a/bin/barbican-all +++ b/bin/barbican-all @@ -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 \ No newline at end of file +uwsgi --master --emperor $PKG_DIR/vassals $OPTS diff --git a/etc/init/barbican-api.conf b/etc/init/barbican-api.conf index af191f094..44c336213 100644 --- a/etc/init/barbican-api.conf +++ b/etc/init/barbican-api.conf @@ -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