move apache config to a template
diff --git a/build.sh b/build.sh
index b487287..1523ece 100755
--- a/build.sh
+++ b/build.sh
@@ -34,8 +34,8 @@
# copy kernel modules
cp -pr /lib/modules/`uname -r` $DEST/lib/modules
-# helpful screenrc
-cp files/screenrc $DEST/root/.screenrc
+# inject stack.sh files
+cp -r files $DEST/opt/files
# copy openstack installer and requirement lists to a new directory.
mkdir -p $DEST/opt
diff --git a/files/000-default.template b/files/000-default.template
new file mode 100644
index 0000000..64251f0
--- /dev/null
+++ b/files/000-default.template
@@ -0,0 +1,25 @@
+<VirtualHost *:80>
+ WSGIScriptAlias / %DASH_DIR%/openstack-dashboard/dashboard/wsgi/django.wsgi
+ WSGIDaemonProcess dashboard user=www-data group=www-data processes=3 threads=10
+ WSGIProcessGroup dashboard
+
+ DocumentRoot %DASH_DIR%/.blackhole/
+ Alias /media %DASH_DIR%/openstack-dashboard/media
+
+ <Directory />
+ Options FollowSymLinks
+ AllowOverride None
+ </Directory>
+
+ <Directory %DASH_DIR%/>
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ allow from all
+ </Directory>
+
+ ErrorLog /var/log/apache2/error.log
+ LogLevel warn
+ CustomLog /var/log/apache2/access.log combined
+</VirtualHost>
+
diff --git a/stack.sh b/stack.sh
index 78d9b4d..8ef39fe 100755
--- a/stack.sh
+++ b/stack.sh
@@ -97,32 +97,8 @@
# setup apache
mkdir $DASH_DIR/.blackhole
- cat > /etc/apache2/sites-enabled/000-default <<EOF
-<VirtualHost *:80>
- WSGIScriptAlias / $DASH_DIR/openstack-dashboard/dashboard/wsgi/django.wsgi
- WSGIDaemonProcess dashboard user=www-data group=www-data processes=3 threads=10
- WSGIProcessGroup dashboard
-
- DocumentRoot $DASH_DIR/.blackhole/
- Alias /media $DASH_DIR/openstack-dashboard/media
-
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
-
- <Directory $DASH_DIR/>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- Order allow,deny
- allow from all
- </Directory>
-
- ErrorLog /var/log/apache2/error.log
- LogLevel warn
- CustomLog /var/log/apache2/access.log combined
-</VirtualHost>
-EOF
+ # 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" > /etc/apache2/sites-enabled/000-default
chown -R www-data:www-data $DASH_DIR
@@ -134,6 +110,9 @@
mkdir -p $DEST/images
tar -C $DEST/images -zxf $DEST/tty.tgz
+
+ # add useful screenrc
+ cp $DIR/files/screenrc ~/.screenrc
exit
fi