Moved config to the config/ directory (closes #144)

Author: samalba

config_s3.yml renamed to config/config_s3.yml

@@ -50,7 +50,8 @@ def load():
         return _config
     data = None
     config_file = os.environ.get('DOCKER_REGISTRY_CONFIG', 'config.yml')
-    config_path = os.path.join(os.path.dirname(__file__), '..', config_file)
+    config_path = os.path.join(os.path.dirname(__file__), '..', 'config',
+                               config_file)
     with open(config_path) as f:
         data = yaml.load(f)
     config = data.get('common', {})

config_sample.yml renamed to config/config_sample.yml

@@ -1,19 +1,19 @@
 #!/bin/bash
 
 WORKER_SECRET_KEY="${WORKER_SECRET_KEY:-$(< /dev/urandom tr -dc A-Za-z0-9 | head -c 32)}"
-sed -i "s/ secret_key: REPLACEME/ secret_key: ${WORKER_SECRET_KEY}/" config.yml
+sed -i "s/ secret_key: REPLACEME/ secret_key: ${WORKER_SECRET_KEY}/" config/config.yml
 
 if [[ -z "$GUNICORN_WORKERS" ]] ; then
     GUNICORN_WORKERS=4
 fi
 
 if [ "$SETTINGS_FLAVOR" = "prod" ] ; then
-    config=$(<config.yml); 
+    config=$(<config/config.yml);
     config=${config//boto_bucket: REPLACEME/boto_bucket: $S3_BUCKET};
     config=${config//s3_access_key: REPLACEME/s3_access_key: $AWS_ACCESS_KEY_ID};
     config=${config//s3_secret_key: REPLACEME/s3_secret_key: $AWS_SECRET_KEY};
     config=${config//s3_bucket: REPLACEME/s3_bucket: $S3_BUCKET};
     config=${config//s3_encrypt: REPLACEME/s3_encrypt: ${S3_ENCRYPT:-False}};
     config=${config//s3_secure: REPLACEME/s3_secure: ${S3_SECURE:-False}};
-    printf '%s\n' "$config" >config.yml
+    printf '%s\n' "$config" >config/config.yml
 fi

config_test.yml renamed to config/config_test.yml

@@ -1,6 +1,5 @@
 [program:api]
-#command = bash -lc "[ -f ~/profile ] && source ~/profile; exec newrelic-admin run-program gunicorn --access-logfile /var/log/supervisor/access.log --debug -k gevent --max-requests 100 --graceful-timeout 3600 -t 3600 -b 0.0.0.0:$PORT_WWW -w 8 wsgi:application"
-command = bash -lc "[ -f ~/profile ] && source ~/profile; exec gunicorn -c gunicorn_config.py wsgi:application"
+command = bash -lc "[ -f ~/profile ] && source ~/profile; exec gunicorn -c config/gunicorn_config.py wsgi:application"
 #environment = NEW_RELIC_CONFIG_FILE="/home/dotcloud/newrelic.ini"
 directory = /home/dotcloud/
 redirect_stderr = true