From 8525944054e2c530e972b6f084fd0a64f5b846a2 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 18 Jan 2016 18:56:56 -0200 Subject: [PATCH] noosfero-apache: migrate to jessie --- debian/noosfero-apache.postinst | 2 +- debian/update-noosfero-apache | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/noosfero-apache.postinst b/debian/noosfero-apache.postinst index 800c495..5cb5202 100644 --- a/debian/noosfero-apache.postinst +++ b/debian/noosfero-apache.postinst @@ -17,7 +17,7 @@ if which update-noosfero-apache >/dev/null; then update-noosfero-apache if [ "$enable_apache_site" = 'true' ]; then - a2ensite noosfero + a2ensite noosfero.conf invoke-rc.d apache2 reload fi fi diff --git a/debian/update-noosfero-apache b/debian/update-noosfero-apache index 0be9ceb..a1b9d2f 100755 --- a/debian/update-noosfero-apache +++ b/debian/update-noosfero-apache @@ -6,7 +6,14 @@ set -e # installed if test -x /usr/share/noosfero/script/apacheconf; then - apache_site='/etc/apache2/sites-available/noosfero' + old_apache_site='/etc/apache2/sites-available/noosfero' + apache_site='/etc/apache2/sites-available/noosfero.conf' + + # migrate from apache 2.2 to 2.4+ + if [ ! -f "$apache_site" -a -f "$old_apache_site" ]; then + mv "$old_apache_site" "$apache_site" + fi + if ! test -e "$apache_site"; then echo "Generating apache virtual host ..." cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site" -- libgit2 0.21.2