From c5602f31bd5b29af6a00a40fdd6ff35cc67115bc Mon Sep 17 00:00:00 2001
From: Tomas Gavenciak <gavento@ucw.cz>
Date: Thu, 2 Apr 2015 00:05:48 +0200
Subject: [PATCH] Uprava pro test deployment

---
 .gitignore              | 1 -
 Makefile                | 5 +++--
 mamweb/settings_test.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97afb2d7..46e9b6bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 /db-local.sqlite3*
 /static
 /media
-/mamweb/static
 /schema_*.pdf
 
 # aux files
diff --git a/Makefile b/Makefile
index aa2c660f..5400311f 100644
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,9 @@ schema_all.pdf:
 	./manage.py graph_models -a -g | dot -Tpdf > schema_all.pdf
 
 
-TEST_USER=${USER}
+TEST_USER=test-mam
 TEST_SERVER=atrey.karlin.mff.cuni.cz
-TEST_DIR=/akce/MaM/MaMweb/test/
+TEST_DIR=/home/test-mam/mamweb-test/
 
 # remote commands
 HEAD=`git log --color=never |head -1|sed 's/.*commit //'`
@@ -75,6 +75,7 @@ push_test:
 		git clean -f && \
 		cp mamweb/settings_test.py mamweb/settings.py && \
 		make install && \
+		./manage.py collectstatic --noinput && \
 		./manage.py migrate --noinput && \
 		(chown -Rf :mam . || true ) && \
 		(chmod -Rf g+w . || true ) && \
diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py
index 95ef435d..202cd2e7 100644
--- a/mamweb/settings_test.py
+++ b/mamweb/settings_test.py
@@ -18,7 +18,7 @@ DEBUG = True
 
 TEMPLATE_DEBUG = True
 
-ALLOWED_HOSTS = ['test.mam.mff.cuni.cz']
+ALLOWED_HOSTS = ['*.mam.mff.cuni.cz']
 
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases