From 259861171f97298947c9c12d9d429de82f13253e Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 16 Nov 2012 03:43:55 +0000 Subject: [PATCH] Restores sanity on how to install files in etc/apache2/sites-available Rewritten-From: f8ee35931c773ec79fb824403c13af24d07c47f9 --- .../openstack-dashboard | 35 ++++++++ .../openstack-dashboard-ssl | 40 +++++++++ .../debian/openstack-dashboard-apache.install | 4 +- .../debian/patches/apache-config-file.patch | 85 ------------------- trusty/debian/patches/series | 1 - 5 files changed, 77 insertions(+), 88 deletions(-) create mode 100644 trusty/debian/apache-sites-available/openstack-dashboard create mode 100644 trusty/debian/apache-sites-available/openstack-dashboard-ssl delete mode 100644 trusty/debian/patches/apache-config-file.patch diff --git a/trusty/debian/apache-sites-available/openstack-dashboard b/trusty/debian/apache-sites-available/openstack-dashboard new file mode 100644 index 0000000..895c565 --- /dev/null +++ b/trusty/debian/apache-sites-available/openstack-dashboard @@ -0,0 +1,35 @@ + + ServerAdmin webmaster@localhost + WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi + WSGIDaemonProcess horizon user=www-data group=www-data + #WSGIProcessGroup openstack-dashboard + Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static + + DocumentRoot /var/www + + + AllowOverride None + + + + Order allow,deny + Allow from all + + + Alias /static/horizon /usr/share/pyshared/horizon/static/horizon + + + Order allow,deny + Allow from all + + + #Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static + + + Order allow,deny + Allow from all + + ErrorLog ${APACHE_LOG_DIR}/error.log + LogLevel warn + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/trusty/debian/apache-sites-available/openstack-dashboard-ssl b/trusty/debian/apache-sites-available/openstack-dashboard-ssl new file mode 100644 index 0000000..3d5b30b --- /dev/null +++ b/trusty/debian/apache-sites-available/openstack-dashboard-ssl @@ -0,0 +1,40 @@ + + ServerAdmin webmaster@localhost + SSLEngine on + SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem + SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key + BrowserMatch "MSIE [2-6]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi + WSGIDaemonProcess horizon user=www-data group=www-data + #WSGIProcessGroup openstack-dashboard + Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static + + DocumentRoot /var/www + + + AllowOverride None + + + + Order allow,deny + Allow from all + + + + Order allow,deny + Allow from all + + + + Order allow,deny + Allow from all + + + ErrorLog ${APACHE_LOG_DIR}/error.log + LogLevel warn + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/trusty/debian/openstack-dashboard-apache.install b/trusty/debian/openstack-dashboard-apache.install index 3067864..ef3b776 100644 --- a/trusty/debian/openstack-dashboard-apache.install +++ b/trusty/debian/openstack-dashboard-apache.install @@ -1,2 +1,2 @@ -etc/apache2/openstack-dashboard /etc/apache2/sites-available -etc/apache2/openstack-dashboard-ssl /etc/apache2/sites-available +debian/apache-sites-available/openstack-dashboard /etc/apache2/sites-available +debian/apache-sites-available/openstack-dashboard-ssl /etc/apache2/sites-available diff --git a/trusty/debian/patches/apache-config-file.patch b/trusty/debian/patches/apache-config-file.patch deleted file mode 100644 index 16d43ba..0000000 --- a/trusty/debian/patches/apache-config-file.patch +++ /dev/null @@ -1,85 +0,0 @@ -Index: horizon/etc/apache2/openstack-dashboard -=================================================================== ---- /dev/null -+++ horizon/etc/apache2/openstack-dashboard -@@ -0,0 +1,35 @@ -+ -+ ServerAdmin webmaster@localhost -+ WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi -+ WSGIDaemonProcess horizon user=www-data group=www-data -+ #WSGIProcessGroup openstack-dashboard -+ Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static -+ -+ DocumentRoot /var/www -+ -+ -+ AllowOverride None -+ -+ -+ -+ Order allow,deny -+ Allow from all -+ -+ -+ Alias /static/horizon /usr/share/pyshared/horizon/static/horizon -+ -+ -+ Order allow,deny -+ Allow from all -+ -+ -+ #Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static -+ -+ -+ Order allow,deny -+ Allow from all -+ -+ ErrorLog ${APACHE_LOG_DIR}/error.log -+ LogLevel warn -+ CustomLog ${APACHE_LOG_DIR}/access.log combined -+ -Index: horizon/etc/apache2/openstack-dashboard-ssl -=================================================================== ---- /dev/null -+++ horizon/etc/apache2/openstack-dashboard-ssl -@@ -0,0 +1,40 @@ -+ -+ ServerAdmin webmaster@localhost -+ SSLEngine on -+ SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem -+ SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key -+ BrowserMatch "MSIE [2-6]" \ -+ nokeepalive ssl-unclean-shutdown \ -+ downgrade-1.0 force-response-1.0 -+ BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown -+ -+ WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi -+ WSGIDaemonProcess horizon user=www-data group=www-data -+ #WSGIProcessGroup openstack-dashboard -+ Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static -+ -+ DocumentRoot /var/www -+ -+ -+ AllowOverride None -+ -+ -+ -+ Order allow,deny -+ Allow from all -+ -+ -+ -+ Order allow,deny -+ Allow from all -+ -+ -+ -+ Order allow,deny -+ Allow from all -+ -+ -+ ErrorLog ${APACHE_LOG_DIR}/error.log -+ LogLevel warn -+ CustomLog ${APACHE_LOG_DIR}/access.log combined -+ diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 47eb7de..64c0a5e 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -2,4 +2,3 @@ fix-dashboard-django-wsgi.patch fix-dashboard-manage.patch fix-ubuntu-tests.patch debian_local_settings.patch -apache-config-file.patch -- 2.45.2