From ff9c57e350d27699643b0ad3b7651dea637b14d7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 22 Sep 2015 13:34:38 +0000 Subject: [PATCH] * Now also allowing Horizon to be installed in /horizon, not just on the takeover of webroot. This will be the default. Rewritten-From: 4b10d90671c8f1d8e97c14d13fd79ef22d3d8753 --- .../openstack-dashboard-alias-only.conf | 18 ++++++++++++++++++ xenial/debian/changelog | 7 +++++++ .../debian/openstack-dashboard-apache.install | 1 + .../debian/openstack-dashboard-apache.postinst | 16 +++++++++++++++- .../openstack-dashboard-apache.templates | 3 +++ xenial/debian/po/cs.po | 14 +++++++++++--- xenial/debian/po/da.po | 18 +++++++++++++----- xenial/debian/po/de.po | 14 +++++++++++--- xenial/debian/po/es.po | 10 +++++++++- xenial/debian/po/fr.po | 18 ++++++++++++++---- xenial/debian/po/it.po | 10 +++++++++- xenial/debian/po/ja.po | 10 +++++++++- xenial/debian/po/nl.po | 10 +++++++++- xenial/debian/po/pt.po | 10 +++++++++- xenial/debian/po/ru.po | 10 +++++++++- xenial/debian/po/sv.po | 10 +++++++++- xenial/debian/po/templates.pot | 12 ++++++++++-- xenial/debian/rules | 3 +++ 18 files changed, 169 insertions(+), 25 deletions(-) create mode 100644 xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf diff --git a/xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf b/xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf new file mode 100644 index 0000000..20f7f34 --- /dev/null +++ b/xenial/debian/apache-sites-available/openstack-dashboard-alias-only.conf @@ -0,0 +1,18 @@ +WSGIScriptAlias /horizon /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi +WSGIDaemonProcess horizon user=www-data group=www-data +Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static +Alias /horizon/static /usr/share/openstack-dashboard/openstack_dashboard/static + + + + Order allow,deny + Allow from all + + + Order allow,deny + Allow from all + + + Order allow,deny + Allow from all + diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 59d8d30..ccca7cc 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,3 +1,10 @@ +horizon (1:8.0.0~b3-4) experimental; urgency=medium + + * Now also allowing Horizon to be installed in /horizon, not just on the + takeover of webroot. This will be the default. + + -- Thomas Goirand Tue, 22 Sep 2015 13:27:52 +0000 + horizon (1:8.0.0~b3-3) experimental; urgency=medium * Also adds symlink to the fonts-roboto-fontface and materialdesignicons diff --git a/xenial/debian/openstack-dashboard-apache.install b/xenial/debian/openstack-dashboard-apache.install index 08de3d0..b4567e1 100644 --- a/xenial/debian/openstack-dashboard-apache.install +++ b/xenial/debian/openstack-dashboard-apache.install @@ -1,3 +1,4 @@ debian/apache-sites-available/openstack-dashboard-ssl-redirect.conf /etc/apache2/sites-available debian/apache-sites-available/openstack-dashboard-ssl.conf /etc/apache2/sites-available debian/apache-sites-available/openstack-dashboard.conf /etc/apache2/sites-available +debian/apache-sites-available/openstack-dashboard-alias-only.conf /etc/apache2/sites-available diff --git a/xenial/debian/openstack-dashboard-apache.postinst b/xenial/debian/openstack-dashboard-apache.postinst index 5ea4272..8df75b6 100644 --- a/xenial/debian/openstack-dashboard-apache.postinst +++ b/xenial/debian/openstack-dashboard-apache.postinst @@ -23,24 +23,38 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache db_get horizon/activate_vhost if [ "${RET}" = "true" ] && [ -x /etc/init.d/apache2 ] ; then sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=yes#' /etc/default/openstack-dashboard-apache - a2dissite default || true + a2dissite 000-default.conf || true + a2dissite default-ssl.conf || true + sed -i "s|^[ \t]*WEBROOT[ \t]=.*|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings.py db_get horizon/use_ssl if [ "${RET}" = "true" ] ; then sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=yes#' /etc/default/openstack-dashboard-apache a2enmod ssl a2enmod rewrite a2dissite openstack-dashboard.conf + a2dissite openstack-dashboard-alias-only.conf a2ensite openstack-dashboard-ssl-redirect.conf a2ensite openstack-dashboard-ssl.conf else sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=no#' /etc/default/openstack-dashboard-apache a2dissite openstack-dashboard-ssl.conf a2dissite openstack-dashboard-ssl-redirect.conf + a2dissite openstack-dashboard-alias-only.conf a2ensite openstack-dashboard.conf fi + /usr/share/openstack-dashboard/manage.py compress --force invoke-rc.d --quiet apache2 reload else sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=no#' /etc/default/openstack-dashboard-apache + a2ensite 000-default.conf || true + a2ensite default-ssl.conf || true + sed -i "s|^[ \t]*WEBROOT[ \t]=.*|WEBROOT = '/horizon'|" /etc/openstack-dashboard/local_settings.py + a2dissite openstack-dashboard.conf + a2dissite openstack-dashboard-ssl-redirect.conf + a2dissite openstack-dashboard-ssl.conf + a2ensite openstack-dashboard-alias-only.conf + /usr/share/openstack-dashboard/manage.py compress --force + invoke-rc.d --quiet apache2 reload fi db_stop fi diff --git a/xenial/debian/openstack-dashboard-apache.templates b/xenial/debian/openstack-dashboard-apache.templates index 627eddd..248acc4 100644 --- a/xenial/debian/openstack-dashboard-apache.templates +++ b/xenial/debian/openstack-dashboard-apache.templates @@ -14,6 +14,9 @@ _Description: Activate Dashboard and disable default VirtualHost? The Apache package sets up a default web site and a default page, configured in /etc/apache2/sites-available/default. . + If this option is not selected, Horizon will be installed using /horizon + instead of the webroot. + . Choose this option to replace that default with the OpenStack Dashboard configuration. diff --git a/xenial/debian/po/cs.po b/xenial/debian/po/cs.po index 32c52a8..43a9a68 100644 --- a/xenial/debian/po/cs.po +++ b/xenial/debian/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon 2013.1.3-2\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2013-10-08 19:12+0200\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-10-12 10:41+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" @@ -32,6 +32,14 @@ msgstr "" "Balíček Apache má výchozí web a výchozí stránku nastavené v /etc/apache2/" "sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 @@ -39,8 +47,8 @@ msgid "" "Choose this option to replace that default with the OpenStack Dashboard " "configuration." msgstr "" -"Tuto možnost zvolte k nahrazení výchozího nastavení nastavením " -"Ovládacího panelu pro OpenStack." +"Tuto možnost zvolte k nahrazení výchozího nastavení nastavením Ovládacího " +"panelu pro OpenStack." #. Type: boolean #. Description diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po index d33303a..31e3f01 100644 --- a/xenial/debian/po/da.po +++ b/xenial/debian/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2013-10-08 19:12+0200\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-10-10 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -29,8 +29,16 @@ msgid "" "The Apache package sets up a default web site and a default page, configured " "in /etc/apache2/sites-available/default." msgstr "" -"Pakken Apache opsætter en standardnetside og en standardside, konfigureret i !" -"/etc/apache2/sites-available/default." +"Pakken Apache opsætter en standardnetside og en standardside, konfigureret " +"i !/etc/apache2/sites-available/default." + +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" #. Type: boolean #. Description @@ -39,8 +47,8 @@ msgid "" "Choose this option to replace that default with the OpenStack Dashboard " "configuration." msgstr "" -"Vælg denne indstilling for at erstatte den standard med Openstack " -"Dashboard-konfigurationen." +"Vælg denne indstilling for at erstatte den standard med Openstack Dashboard-" +"konfigurationen." #. Type: boolean #. Description diff --git a/xenial/debian/po/de.po b/xenial/debian/po/de.po index d00430e..14ec44f 100644 --- a/xenial/debian/po/de.po +++ b/xenial/debian/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon 2014.1-2\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2014-06-05 22:45+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -34,6 +34,14 @@ msgstr "" "Das Paket Apache richtet eine Standard-Website und eine Standardseite ein, " "die in /etc/apache2/sites-available/default konfiguriert werden." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 @@ -41,8 +49,8 @@ msgid "" "Choose this option to replace that default with the OpenStack Dashboard " "configuration." msgstr "" -"Wählen Sie diese Option, um diese Voreinstellung durch die " -"OpenStack-Dashboard-Konfiguration zu ersetzen." +"Wählen Sie diese Option, um diese Voreinstellung durch die OpenStack-" +"Dashboard-Konfiguration zu ersetzen." #. Type: boolean #. Description diff --git a/xenial/debian/po/es.po b/xenial/debian/po/es.po index 98e8cbf..bdf69ad 100644 --- a/xenial/debian/po/es.po +++ b/xenial/debian/po/es.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-12-08 21:21-0300\n" "Last-Translator: Matías Bellone \n" "Language-Team: Debian Spanish \n" @@ -63,6 +63,14 @@ msgstr "" "Seleccione esta opción si desea desactivar esta configuración y reemplazarla " "con la configuración del panel de control de OpenStack («Dashboard»)." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/fr.po b/xenial/debian/po/fr.po index 68873f1..3ee591f 100644 --- a/xenial/debian/po/fr.po +++ b/xenial/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-10-09 09:09+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: FRENCH \n" @@ -33,6 +33,16 @@ msgstr "" "Le paquet Apache installe un site et une page par défaut, configurés dans /" "etc/apache2/sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" +"Si cette option n'est pas selectionée, Horizon sera installé sur /horizon " +"plustot que la racine du server web." + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 @@ -40,14 +50,14 @@ msgid "" "Choose this option to replace that default with the OpenStack Dashboard " "configuration." msgstr "" -"Choisissez cette option pour remplacer ce réglage par défaut par la " +"Choisissez cette option pour remplacer le réglage par défaut par la " "configuration d'OpenStack Dashboard." #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:3001 msgid "Should the Dashboard use HTTPS?" -msgstr "Faut-il utiliser HTTPS pour Dashboard ?" +msgstr "Faut-il utiliser HTTPS pour le Dashboard ?" #. Type: boolean #. Description @@ -56,5 +66,5 @@ msgid "" "Select this option if you would like Horizon to be served over HTTPS only, " "with a redirection to HTTPS if HTTP is in use." msgstr "" -"Veuillez choisir si vous souhaitez qu'Horizon soit installé sur HTTPS " +"Veuillez choisir cette option si vous souhaitez qu'Horizon soit installé sur HTTPS " "uniquement, avec une redirection vers HTTPS si HTTP est utilisé." diff --git a/xenial/debian/po/it.po b/xenial/debian/po/it.po index ca63d7f..63a0b65 100644 --- a/xenial/debian/po/it.po +++ b/xenial/debian/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-10-19 18:48+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" @@ -33,6 +33,14 @@ msgstr "" "Il pacchetto Apache imposta un sito web e una pagina predefiniti, " "configurati in /etc/apache2/sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/ja.po b/xenial/debian/po/ja.po index bb7baf5..310c44d 100644 --- a/xenial/debian/po/ja.po +++ b/xenial/debian/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-07-19 23:32+0900\n" "Last-Translator: victory \n" "Language-Team: Japanese \n" @@ -32,6 +32,14 @@ msgstr "" "Apache パッケージがデフォルトウェブサイトやデフォルトページを用意しています。" "これは /etc/apache2/sites-available/default で設定されています。" +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/nl.po b/xenial/debian/po/nl.po index f407755..def8126 100644 --- a/xenial/debian/po/nl.po +++ b/xenial/debian/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2014-10-08 23:05+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Dutch \n" @@ -33,6 +33,14 @@ msgstr "" "Het pakket Apache zet een standaardwebsite en een standaardpagina op in /etc/" "apache2/sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/pt.po b/xenial/debian/po/pt.po index fc79e71..c585857 100644 --- a/xenial/debian/po/pt.po +++ b/xenial/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon 2013.2-1\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-11-18 19:42+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -34,6 +34,14 @@ msgstr "" "O pacote Apache define um sítio web predefinido e uma página predefinida, " "configurada em /etc/apache2/sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/ru.po b/xenial/debian/po/ru.po index d0eba55..f057ee0 100644 --- a/xenial/debian/po/ru.po +++ b/xenial/debian/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon 2013.1.3-2\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2013-10-09 19:26+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -34,6 +34,14 @@ msgstr "" "В пакете Apache уже настроен веб-сайт и страница по умолчанию согласно /etc/" "apache2/sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/sv.po b/xenial/debian/po/sv.po index 862ab7c..afab3ff 100644 --- a/xenial/debian/po/sv.po +++ b/xenial/debian/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: 2015-04-01 16:51+0100\n" "Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" @@ -34,6 +34,14 @@ msgstr "" "Apache-paketet levereras med en standard webbplats och en standard sida, " "dessa inställningar finns i /etc/apache2/sites-available/default." +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/po/templates.pot b/xenial/debian/po/templates.pot index f283499..2dc11e6 100644 --- a/xenial/debian/po/templates.pot +++ b/xenial/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the horizon package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: horizon\n" "Report-Msgid-Bugs-To: horizon@packages.debian.org\n" -"POT-Creation-Date: 2014-03-07 10:34+0100\n" +"POT-Creation-Date: 2015-09-22 13:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,6 +31,14 @@ msgid "" "in /etc/apache2/sites-available/default." msgstr "" +#. Type: boolean +#. Description +#: ../openstack-dashboard-apache.templates:2001 +msgid "" +"If this option is not selected, Horizon will be installed using /horizon " +"instead of the webroot." +msgstr "" + #. Type: boolean #. Description #: ../openstack-dashboard-apache.templates:2001 diff --git a/xenial/debian/rules b/xenial/debian/rules index 39cf2fc..b5a4d5c 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -43,6 +43,9 @@ override_dh_link: mv $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/* $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss rmdir $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss dh_link + for i in auth framework horizon ; do \ + ln -s /usr/lib/python2.7/dist-packages/horizon/static/$$i $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/$$i ; \ + done override_dh_auto_clean: dh_auto_clean -- 2.45.2