6 files changed, 0 insertions, 170 deletions
diff --git a/keystone-moon/httpd/README b/keystone-moon/httpd/README
deleted file mode 100644
index 35a32fc0..00000000
--- a/keystone-moon/httpd/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Documentation for running Keystone with Apache HTTPD is in
-doc/source/apache-httpd.rst
diff --git a/keystone-moon/httpd/keystone-uwsgi-admin.ini b/keystone-moon/httpd/keystone-uwsgi-admin.ini
deleted file mode 100644
index 8624ee3e..00000000
--- a/keystone-moon/httpd/keystone-uwsgi-admin.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[uwsgi]
-wsgi-file = /usr/local/bin/keystone-wsgi-admin
-
-# Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see
-# http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
-uwsgi-socket = 127.0.0.1:35358
-
-# Override the default size for headers from the 4k default.
-buffer-size = 65535
-
-# This is running standalone
-master = true
-
-enable-threads = true
-
-# Tune this to your environment.
-threads = 4
-
-# uwsgi recommends this to prevent thundering herd on accept.
-thunder-lock = true
-
-plugins = python
diff --git a/keystone-moon/httpd/keystone-uwsgi-public.ini b/keystone-moon/httpd/keystone-uwsgi-public.ini
deleted file mode 100644
index c9521163..00000000
--- a/keystone-moon/httpd/keystone-uwsgi-public.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[uwsgi]
-wsgi-file = /usr/local/bin/keystone-wsgi-public
-
-# Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see
-# http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
-uwsgi-socket = 127.0.0.1:5001
-
-# Override the default size for headers from the 4k default.
-buffer-size = 65535
-
-# This is running standalone
-master = true
-
-enable-threads = true
-
-# Tune this to your environment.
-threads = 4
-
-# uwsgi recommends this to prevent thundering herd on accept.
-thunder-lock = true
-
-plugins = python
diff --git a/keystone-moon/httpd/keystone.py b/keystone-moon/httpd/keystone.py
deleted file mode 100644
index 05683a91..00000000
--- a/keystone-moon/httpd/keystone.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2013 OpenStack Foundation
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import os
-
-from oslo_log import log
-from oslo_log import versionutils
-
-from keystone.i18n import _LW
-from keystone.server import wsgi as wsgi_server
-
-
-name = os.path.basename(__file__)
-LOG = log.getLogger(__name__)
-
-
-def deprecation_warning():
-    versionutils.report_deprecated_feature(
-        LOG,
-        _LW('httpd/keystone.py is deprecated as of Mitaka'
-            ' in favor of keystone-wsgi-admin and keystone-wsgi-public'
-            ' and may be removed in O.')
-    )
-
-# NOTE(ldbragst): 'application' is required in this context by WSGI spec.
-# The following is a reference to Python Paste Deploy documentation
-# http://pythonpaste.org/deploy/
-application = wsgi_server.initialize_application(
-    name,
-    post_log_configured_function=deprecation_warning)
diff --git a/keystone-moon/httpd/uwsgi-keystone.conf b/keystone-moon/httpd/uwsgi-keystone.conf
deleted file mode 100644
index 2d61a5bf..00000000
--- a/keystone-moon/httpd/uwsgi-keystone.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-Listen 5000
-Listen 35357
-
-<VirtualHost *:5000>
-    ProxyPass / uwsgi://127.0.0.1:5001/
-</VirtualHost>
-
-<VirtualHost *:35357>
-    ProxyPass / uwsgi://127.0.0.1:35358/
-</VirtualHost>
-
-ProxyPass /identity uwsgi://127.0.0.1:5001/
-ProxyPass /identity_admin uwsgi://127.0.0.1:35358/
diff --git a/keystone-moon/httpd/wsgi-keystone.conf b/keystone-moon/httpd/wsgi-keystone.conf
deleted file mode 100644
index 52a46370..00000000
--- a/keystone-moon/httpd/wsgi-keystone.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-Listen 5000
-Listen 35357
-
-<VirtualHost *:5000>
-    WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
-    WSGIProcessGroup keystone-public
-    WSGIScriptAlias / /usr/local/bin/keystone-wsgi-public
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    LimitRequestBody 114688
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog /var/log/apache2/keystone.log
-    CustomLog /var/log/apache2/keystone_access.log combined
-
-    <Directory /usr/local/bin>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-</VirtualHost>
-
-<VirtualHost *:35357>
-    WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
-    WSGIProcessGroup keystone-admin
-    WSGIScriptAlias / /usr/local/bin/keystone-wsgi-admin
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    LimitRequestBody 114688
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog /var/log/apache2/keystone.log
-    CustomLog /var/log/apache2/keystone_access.log combined
-
-    <Directory /usr/local/bin>
-        <IfVersion >= 2.4>
-            Require all granted
-        </IfVersion>
-        <IfVersion < 2.4>
-            Order allow,deny
-            Allow from all
-        </IfVersion>
-    </Directory>
-</VirtualHost>
-
-Alias /identity /usr/local/bin/keystone-wsgi-public
-<Location /identity>
-    SetHandler wsgi-script
-    Options +ExecCGI
-
-    WSGIProcessGroup keystone-public
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-</Location>
-
-Alias /identity_admin /usr/local/bin/keystone-wsgi-admin
-<Location /identity_admin>
-    SetHandler wsgi-script
-    Options +ExecCGI
-
-    WSGIProcessGroup keystone-admin
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-</Location>