Browse code

comments, and fix the sed expression for 000-default

Anthony Young authored on 2011/09/14 09:00:00
Showing 2 changed files
... ...
@@ -99,6 +99,7 @@ su -c "git clone git://github.com/cloudbuilders/nfs-stack.git ~/nfs-stack" stack
99 99
 su -c "cd ~/nfs-stack && ./stack.sh" stack
100 100
 EOF
101 101
 
102
+# Make the install.sh executable
102 103
 chmod 700 $INSTALL_SH
103 104
 
104 105
 # Make installer run on boot
... ...
@@ -151,9 +151,9 @@ dashboard/manage.py syncdb
151 151
 # create an empty directory that apache uses as docroot
152 152
 mkdir $DASH_DIR/.blackhole
153 153
 
154
-## FIXME(ja): can't figure out how to make $DASH_DIR work in sed, also install to available/a2e it 
155
-cat $DIR/files/000-default.template | sed 's/%DASH_DIR%/\/opt\/dash/g' > /tmp/000-default
156
-sudo mv /tmp/000-default /etc/apache2/sites-enabled
154
+## Configure apache's 000-default to run dashboard
155
+sudo cp $DIR/files/000-default.template /etc/apache2/sites-enabled/000-default
156
+sudo sed -e "s,%DASH_DIR%,$DASH_DIR,g" -i $/etc/apache2/sites-enabled/000-default
157 157
 
158 158
 # ``python setup.py develop`` left some files owned by root in ``DASH_DIR`` and
159 159
 # others by the original owner.  We need to change the owner to apache so