Moved config files back to etc/barbican

barbican/common/config.py

@@ -25,8 +25,8 @@ from oslo.config import cfg
 CONF_FILES = cfg.find_config_files(prog='barbican-api')
 
 #CONF_FILES = cfg.find_config_files(project='barbican', prog='barbican-api')
-CONF_FILES.append('./etc/barbican-api.conf')
-CONF_FILES.append('../etc/barbican-api.conf')
+CONF_FILES.append('./etc/barbican/barbican-api.conf')
+CONF_FILES.append('../etc/barbican/barbican-api.conf')
 CONF_FILES = [cfile for cfile in CONF_FILES if os.path.isfile(cfile)]
 
 # Set configuration files

bin/barbican-api

@@ -5,18 +5,18 @@
 PKG=barbican
 
 # For local development, set VENV_PYTHON equal to the path to your virtual environment's site-packages location
-VENV=.venv_barbican
+VENV=.venv
 VENV_PYTHON=./$VENV/lib/python2.7/site-packages
 
 PATH=/opt/uwsgi:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/etc/$PKG:$PATH
-CONF_FILE=/etc/barbican-api.ini
-PASTE_FILE=/etc/barbican-api-paste.ini
+CONF_FILE=/etc/$PKG/barbican-api.ini
+PASTE_FILE=/etc/$PKG/barbican-api-paste.ini
 OPTS=''
 if [ ! -f $CONF_FILE ];
 then
-  CONF_FILE=./etc/barbican-api.ini
+  CONF_FILE=./etc/$PKG/barbican-api.ini
   PYTHONPATH=$VENV_PYTHON:$PYTHONPATH
-  PASTE_FILE=$PWD/etc/barbican-api-paste.ini
+  PASTE_FILE=$PWD/etc/$PKG/barbican-api-paste.ini
   OPTS='-H ./'$VENV
 fi
 

debian/barbican-api.install

@@ -1,3 +1,4 @@
+etc/barbican/barbican-api-paste.ini etc/barbican
+etc/barbican/barbican-api.conf etc/barbican
 etc/barbican/barbican-api.ini etc/barbican
-etc/barbican/config.py etc/barbican
 usr/bin/barbican-api