diff --git a/barbican/api/app.py b/barbican/api/app.py index a18cb67ab..905678a7b 100644 --- a/barbican/api/app.py +++ b/barbican/api/app.py @@ -57,3 +57,13 @@ def create_main_app(global_config, **local_conf): api.add_route('/{0}'.format(performance_uri), performance) return wsgi_app + + +def create_admin_app(global_config, **local_conf): + config.parse_args() + + versions = res.VersionResource() + wsgi_app = api = falcon.API() + api.add_route('/', versions) + + return wsgi_app \ No newline at end of file diff --git a/etc/barbican/barbican-admin-paste.ini b/etc/barbican/barbican-admin-paste.ini new file mode 100644 index 000000000..e24b9fb72 --- /dev/null +++ b/etc/barbican/barbican-admin-paste.ini @@ -0,0 +1,8 @@ +[pipeline:main] +pipeline = unauthenticated-context admin + +[app:admin] +paste.app_factory = barbican.api.app:create_admin_app + +[filter:unauthenticated-context] +paste.filter_factory = barbican.api.middleware.context:UnauthenticatedContextMiddleware.factory diff --git a/etc/barbican/barbican-api.ini b/etc/barbican/barbican-api.ini deleted file mode 100644 index 10f384a09..000000000 --- a/etc/barbican/barbican-api.ini +++ /dev/null @@ -1,11 +0,0 @@ -[uwsgi] -socket = :9311 -protocol = http -processes = 1 -master = true -vaccum = true -no-default-app = true -memory-report = true - -pythonpath = /etc/barbican -module = barbican.api.app:application diff --git a/etc/barbican/vassals/barbican-admin.ini b/etc/barbican/vassals/barbican-admin.ini new file mode 100644 index 000000000..636ad18b8 --- /dev/null +++ b/etc/barbican/vassals/barbican-admin.ini @@ -0,0 +1,8 @@ +[uwsgi] +socket = :9312 +protocol = http +processes = 1 +vacuum = true +no-default-app = true +memory-report = true +paste = config:/etc/barbican/barbican-admin-paste.ini diff --git a/etc/barbican/vassals/barbican-api.ini b/etc/barbican/vassals/barbican-api.ini new file mode 100644 index 000000000..9f2d55bde --- /dev/null +++ b/etc/barbican/vassals/barbican-api.ini @@ -0,0 +1,8 @@ +[uwsgi] +socket = :9311 +protocol = http +processes = 1 +vacuum = true +no-default-app = true +memory-report = true +paste = config:/etc/barbican/barbican-api-paste.ini