Download as
Browse Code »

Commit 8525944054e2c530e972b6f084fd0a64f5b846a2

Authored by Antonio Terceiro
1 parent 424988e4
Exists in master and in 15 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, web_steps_improvements

noosfero-apache: migrate to jessie

Showing 2 changed files with 9 additions and 2 deletions   Show diff stats
debian/noosfero-apache.postinst
  Diff comments   View file @8525944
@@ -17,7 +17,7 @@ if which update-noosfero-apache >/dev/null; then @@ -17,7 +17,7 @@ if which update-noosfero-apache >/dev/null; then
17 update-noosfero-apache 17 update-noosfero-apache
18 18
19 if [ "$enable_apache_site" = 'true' ]; then 19 if [ "$enable_apache_site" = 'true' ]; then
20 - a2ensite noosfero 20 + a2ensite noosfero.conf
21 invoke-rc.d apache2 reload 21 invoke-rc.d apache2 reload
22 fi 22 fi
23 fi 23 fi
debian/update-noosfero-apache
  Diff comments   View file @8525944
@@ -6,7 +6,14 @@ set -e @@ -6,7 +6,14 @@ set -e
6 # installed 6 # installed
7 if test -x /usr/share/noosfero/script/apacheconf; then 7 if test -x /usr/share/noosfero/script/apacheconf; then
8 8
9 - apache_site='/etc/apache2/sites-available/noosfero' 9 + old_apache_site='/etc/apache2/sites-available/noosfero'
  10 + apache_site='/etc/apache2/sites-available/noosfero.conf'
  11 +
  12 + # migrate from apache 2.2 to 2.4+
  13 + if [ ! -f "$apache_site" -a -f "$old_apache_site" ]; then
  14 + mv "$old_apache_site" "$apache_site"
  15 + fi
  16 +
10 if ! test -e "$apache_site"; then 17 if ! test -e "$apache_site"; then
11 echo "Generating apache virtual host ..." 18 echo "Generating apache virtual host ..."
12 cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site" 19 cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site"