Merge pull request #108 from cloudbuilders/jcannava

Restart apache after linking the default dash config.
This commit is contained in:
Jesse Andrews 2011-10-28 10:42:37 -07:00
commit 8094469253

View file

@ -462,6 +462,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 service apache2 restart
fi
@ -768,7 +769,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
# ==============