From 030767d3fae17aecc8c1f0bf0346195e8ea475e7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 22 Nov 2012 14:29:42 +0000 Subject: [PATCH] * adds || true when calling invoke-rc.d --quiet apache2 reload in dashboard postrm * Packages a openstack-dashboard-ssl-redirect apache sites-available config file. Rewritten-From: 39272bc33cf652a1ec33f4f6e68f6ab2ab1d9814 --- .../openstack-dashboard-ssl-redirect | 16 ++++++++++++++++ xenial/debian/openstack-dashboard-apache.install | 1 + xenial/debian/openstack-dashboard-apache.postrm | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xenial/debian/apache-sites-available/openstack-dashboard-ssl-redirect diff --git a/xenial/debian/apache-sites-available/openstack-dashboard-ssl-redirect b/xenial/debian/apache-sites-available/openstack-dashboard-ssl-redirect new file mode 100644 index 0000000..9246c1d --- /dev/null +++ b/xenial/debian/apache-sites-available/openstack-dashboard-ssl-redirect @@ -0,0 +1,16 @@ + + ServerAdmin webmaster@localhost + DocumentRoot /var/www + + + AllowOverride None + + + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + + ErrorLog ${APACHE_LOG_DIR}/error.log + LogLevel warn + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/xenial/debian/openstack-dashboard-apache.install b/xenial/debian/openstack-dashboard-apache.install index ef3b776..9f2865e 100644 --- a/xenial/debian/openstack-dashboard-apache.install +++ b/xenial/debian/openstack-dashboard-apache.install @@ -1,2 +1,3 @@ debian/apache-sites-available/openstack-dashboard /etc/apache2/sites-available debian/apache-sites-available/openstack-dashboard-ssl /etc/apache2/sites-available +debian/apache-sites-available/openstack-dashboard-ssl-redirect /etc/apache2/sites-available diff --git a/xenial/debian/openstack-dashboard-apache.postrm b/xenial/debian/openstack-dashboard-apache.postrm index 0f3a253..1ecb2bb 100644 --- a/xenial/debian/openstack-dashboard-apache.postrm +++ b/xenial/debian/openstack-dashboard-apache.postrm @@ -3,7 +3,7 @@ set -e if [ -x "`which invoke-rc.d 2>/dev/null`" -a -x "/etc/init.d/apache2" ] ; then - invoke-rc.d --quiet apache2 reload + invoke-rc.d --quiet apache2 reload || true fi #DEBHELPER# \ No newline at end of file -- 2.45.2