From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Sun, 3 Jan 2016 15:07:56 +0000 (+0100)
Subject: partially fix PMA address, re-add django init commands at startup
X-Git-Tag: 1.6b~7^2~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6d4bef09c9693d72a1bce7979ac4149e21b3c593;p=telemeta.git

partially fix PMA address, re-add django init commands at startup
---

diff --git a/app/deploy/nginx-app.conf b/app/deploy/nginx-app.conf
index 2316b967..4cadc469 100644
--- a/app/deploy/nginx-app.conf
+++ b/app/deploy/nginx-app.conf
@@ -23,10 +23,10 @@ server {
        # phpmyadmin
        location /phpmyadmin/ {
             proxy_pass http://phpmyadmin/;
-            proxy_set_header Host $http_host;
+            #proxy_set_header Host $http_host;
             #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             #proxy_set_header X-Forwarded-Server $http_host;
-            #proxy_redirect default;
+            #proxy_redirect / /phpmyadmin/;
             #proxy_cookie_path / /phpmyadmin/;
        }
 
diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 01fcf603..18c1695c 100644
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -23,6 +23,13 @@ python $manage syncdb --noinput
 python $manage migrate --noinput
 python $manage collectstatic --noinput
 
+if [ ! -f $app/.init ]; then
+ python $manage telemeta-create-admin-user
+ python $manage telemeta-create-boilerplate
+ python $manage update_index --workers $processes
+ touch $app/.init
+fi
+
 # static files auto update
 watchmedo shell-command --patterns="*.js;*.css" --recursive \
     --command='python '$manage' collectstatic --noinput' $static &
diff --git a/docker-compose.yml b/docker-compose.yml
index ab328d38..3499c8de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -94,3 +94,5 @@ phpmyadmin:
       - "1234:80"
     links:
       - db:mysql
+    environment:
+      - ABSOLUTE_URI=http://localhost:8000/phpmyadmin/