comments, and fix the sed expression for 000-default

This commit is contained in:
Anthony Young 2011-09-13 17:00:00 -07:00
parent e8d9cd8b09
commit 76d5dc7765
2 changed files with 4 additions and 3 deletions

View file

@ -99,6 +99,7 @@ su -c "git clone git://github.com/cloudbuilders/nfs-stack.git ~/nfs-stack" stack
su -c "cd ~/nfs-stack && ./stack.sh" stack
EOF
# Make the install.sh executable
chmod 700 $INSTALL_SH
# Make installer run on boot

View file

@ -151,9 +151,9 @@ dashboard/manage.py syncdb
# create an empty directory that apache uses as docroot
mkdir $DASH_DIR/.blackhole
## FIXME(ja): can't figure out how to make $DASH_DIR work in sed, also install to available/a2e it
cat $DIR/files/000-default.template | sed 's/%DASH_DIR%/\/opt\/dash/g' > /tmp/000-default
sudo mv /tmp/000-default /etc/apache2/sites-enabled
## Configure apache's 000-default to run dashboard
sudo cp $DIR/files/000-default.template /etc/apache2/sites-enabled/000-default
sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i $/etc/apache2/sites-enabled/000-default
# ``python setup.py develop`` left some files owned by root in ``DASH_DIR`` and
# others by the original owner. We need to change the owner to apache so