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 2316b96703a9bfcaf8a35b9e49c8bcdebaf33325..4cadc469564dd99e8f1456a6c166a356ba841e69 100644 (file)
--- 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 01fcf6039c50918309aeca75eb650b0aa3d16da5..18c1695ca9075d77f9c7067065e82cea5a5c1908 100644 (file)
--- 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 ab328d38bd48f19ecbe7703de36efa1d6c0eed63..3499c8deab691a35ea56f633e34db467241b8e62 100644 (file)
--- 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/