From 76d5dc77654010bd5411ff21db634829b6f0cc03 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Tue, 13 Sep 2011 17:00:00 -0700 Subject: [PATCH] comments, and fix the sed expression for 000-default --- build_lxc.sh | 1 + stack.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build_lxc.sh b/build_lxc.sh index 4b10afc..e3765db 100755 --- a/build_lxc.sh +++ b/build_lxc.sh @@ -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 diff --git a/stack.sh b/stack.sh index 0f49965..963bdff 100755 --- a/stack.sh +++ b/stack.sh @@ -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