From 2457bdd4e698b9cfd473f601e4ecc950081722dc Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Fri, 15 Feb 2013 19:53:28 -0500 Subject: [PATCH 1/1] Move hcoop vhost config into sites-available --- debian/hcoop-apache2-config.install | 3 ++- debian/hcoop-apache2-config.postinst | 4 ++++ debian/hcoop-apache2-config.postrm | 2 ++ files/{conf.d/hcoop_vhosts => sites-available/hcoop-vhosts} | 0 4 files changed, 8 insertions(+), 1 deletion(-) rename files/{conf.d/hcoop_vhosts => sites-available/hcoop-vhosts} (100%) diff --git a/debian/hcoop-apache2-config.install b/debian/hcoop-apache2-config.install index 5982463..fffb209 100644 --- a/debian/hcoop-apache2-config.install +++ b/debian/hcoop-apache2-config.install @@ -3,4 +3,5 @@ files/apache_in.rules etc/ferm/service.in.d files/apache_out.rules etc/ferm/service.out.d files/www-data.hcoop etc/apache2/suexec files/suphp.conf.hcoop etc/suphp -files/mods-available/* etc/apache2/mods-available \ No newline at end of file +files/mods-available/* etc/apache2/mods-available +files/sites-available/* etc/apache2/sites-available \ No newline at end of file diff --git a/debian/hcoop-apache2-config.postinst b/debian/hcoop-apache2-config.postinst index 4448d88..9df107d 100644 --- a/debian/hcoop-apache2-config.postinst +++ b/debian/hcoop-apache2-config.postinst @@ -29,6 +29,10 @@ case "$1" in for mod in $HCOOP_APACHE_MODULES; do a2enmod -q $mod done + + # Enable vhosts. This has to be in sites-enabled so that + # 000default is loaded before member vhosts + a2ensite hcoop-vhosts HCOOP_ENABLE_FAILED=0 for mod in $HCOOP_APACHE_MODULES; do diff --git a/debian/hcoop-apache2-config.postrm b/debian/hcoop-apache2-config.postrm index e2b992a..1eea3f5 100644 --- a/debian/hcoop-apache2-config.postrm +++ b/debian/hcoop-apache2-config.postrm @@ -24,6 +24,8 @@ case "$1" in a2dismod -q -f $mod || true done + a2dissite hcoop-vhosts + # invoke-rc.d apache2 restart ;; diff --git a/files/conf.d/hcoop_vhosts b/files/sites-available/hcoop-vhosts similarity index 100% rename from files/conf.d/hcoop_vhosts rename to files/sites-available/hcoop-vhosts -- 2.20.1