Merge pull request #34 from gwu-libraries/t33-admin_formatting

For #33 - Fixes admin formatting
gwu-libraries · Oct 5, 2015 · 20f8859 · 20f8859
2 parents 6a4de76 + ad5b24c
commit 20f8859
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/docker/app-dev/apache.conf b/docker/app-dev/apache.conf
@@ -1,5 +1,5 @@
-Alias /static/ /opt/sfm-ui/sfm/ui/static/
-<Directory /opt/sfm-ui/sfm/ui/static>
+Alias /static/ /opt/sfm-static/
+<Directory /opt/sfm-static>
     Require all granted
 </Directory>
 

diff --git a/docker/app-dev/invoke.sh b/docker/app-dev/invoke.sh
@@ -20,6 +20,9 @@ echo "Syncing db"
 echo "Migrating db"
 /opt/sfm-ui/sfm/manage.py migrate --noinput
 
+echo "Collecting static files"
+/opt/sfm-ui/sfm/manage.py collectstatic --noinput
+
 echo "Running server"
 #Not entirely sure why this is necessary, but it works.
 /etc/init.d/apache2 start

diff --git a/docker/app-master/apache.conf b/docker/app-master/apache.conf
@@ -1,5 +1,5 @@
-Alias /static/ /opt/sfm-ui/sfm/ui/static/
-<Directory /opt/sfm-ui/sfm/ui/static>
+Alias /static/ /opt/sfm-static/
+<Directory /opt/sfm-static>
     Require all granted
 </Directory>
 

diff --git a/docker/app-master/invoke.sh b/docker/app-master/invoke.sh
@@ -17,6 +17,9 @@ echo "Syncing db"
 echo "Migrating db"
 /opt/sfm-ui/sfm/manage.py migrate --noinput
 
+echo "Collecting static files"
+/opt/sfm-ui/sfm/manage.py collectstatic --noinput
+
 echo "Running server"
 #Not entirely sure why this is necessary, but it works.
 /etc/init.d/apache2 start

diff --git a/docker/app-prod/0.2.0/apache.conf b/docker/app-prod/0.2.0/apache.conf
@@ -1,5 +1,5 @@
-Alias /static/ /opt/sfm-ui/sfm/ui/static/
-<Directory /opt/sfm-ui/sfm/ui/static>
+Alias /static/ /opt/sfm-static/
+<Directory /opt/sfm-static>
     Require all granted
 </Directory>
 

diff --git a/docker/app-prod/0.2.0/invoke.sh b/docker/app-prod/0.2.0/invoke.sh
@@ -17,6 +17,9 @@ echo "Syncing db"
 echo "Migrating db"
 /opt/sfm-ui/sfm/manage.py migrate --noinput
 
+echo "Collecting static files"
+/opt/sfm-ui/sfm/manage.py collectstatic --noinput
+
 echo "Running server"
 #Not entirely sure why this is necessary, but it works.
 /etc/init.d/apache2 start

diff --git a/sfm/sfm/settings/docker_settings.py b/sfm/sfm/settings/docker_settings.py
@@ -11,3 +11,5 @@
 
 # A hashed version of `SITE_SUPERUSER_PASSWORD` will be store in superuser's `password` field.
 SITE_SUPERUSER_PASSWORD = env.get('SFM_SITE_ADMIN_PASSWORD', 'password')
+
+STATIC_ROOT = "/opt/sfm-static"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@

		# A hashed version of `SITE_SUPERUSER_PASSWORD` will be store in superuser's `password` field.
		SITE_SUPERUSER_PASSWORD = env.get('SFM_SITE_ADMIN_PASSWORD', 'password')

		STATIC_ROOT = "/opt/sfm-static"