From aca9a418e139dd404f1505c4e6b99c03113a819a Mon Sep 17 00:00:00 2001 From: Jason Cannavale Date: Thu, 27 Oct 2011 08:45:20 -0700 Subject: [PATCH 1/2] Restart apache after linking the default dash config. --- stack.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/stack.sh b/stack.sh index 14bcfb2762..c0d44911b8 100755 --- a/stack.sh +++ b/stack.sh @@ -447,6 +447,7 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default sudo sed -e "s,%USER%,$USER,g" -i /etc/apache2/sites-enabled/000-default sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default + sudo /sbin/service apache2 restart fi From c96b024767ab1ec6c2938189ff8c1289acea7b7f Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Fri, 28 Oct 2011 10:34:26 -0700 Subject: [PATCH 2/2] don't need to restart apache inside screen it is now being restarted during installation --- stack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.sh b/stack.sh index c0d44911b8..622a10b51f 100755 --- a/stack.sh +++ b/stack.sh @@ -447,7 +447,7 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then sudo cp $FILES/000-default.template /etc/apache2/sites-enabled/000-default sudo sed -e "s,%USER%,$USER,g" -i /etc/apache2/sites-enabled/000-default sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i /etc/apache2/sites-enabled/000-default - sudo /sbin/service apache2 restart + sudo service apache2 restart fi @@ -733,7 +733,7 @@ screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume" screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network" screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler" screen_it n-vnc "cd $NOVNC_DIR && ./utils/nova-wsproxy.py 6080 --web . --flagfile=../nova/bin/nova.conf" -screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /var/log/apache2/error.log" +screen_it dash "cd $DASH_DIR && sudo tail -f /var/log/apache2/error.log" # Install Images # ==============