cleanup, try to get phpMyAdmin working behind relative path...

diff --git a/app/deploy/nginx-app.conf b/app/deploy/nginx-app.conf
index 3dc4489174a80f3e390d6367b472ea1b3dc4b4de..bbe8f494173163a5bf89adad6113237caa909e48 100644 (file)
--- a/app/deploy/nginx-app.conf
+++ b/app/deploy/nginx-app.conf
@@ -12,17 +12,18 @@ server {
        client_max_body_size 4096M; # adjust to taste
 
        # Django media
-       location /media {
-                       alias /srv/media; # your Django project's media files - amend as required
+       location /media/ {
+                       alias /srv/media/; # your Django project's media files - amend as required
        }
        # Django static
        location /static {
-               alias /srv/static; # your Django project's static files - amend as required
+               alias /srv/static/; # your Django project's static files - amend as required
        }
 
        # phpmyadmin
-       location /phpmyadmin {
-               proxy_pass http://phpmyadmin:80/;
+       location /phpmyadmin/ {
+            proxy_pass http://phpmyadmin/;
+            proxy_set_header Host $http_host;
        }
 
        location / {

diff --git a/app/deploy/start_app.sh b/app/deploy/start_app.sh
index 0b3947eeec6a76f99897c58acd5820c5bd4d3e76..01fcf6039c50918309aeca75eb650b0aa3d16da5 100644 (file)
--- a/app/deploy/start_app.sh
+++ b/app/deploy/start_app.sh
@@ -23,16 +23,9 @@ 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 &  
+    --command='python '$manage' collectstatic --noinput' $static &
 
 # app start
 uwsgi --socket :$port --wsgi-file $wsgi --chdir $app --master --processes $processes --threads $threads --py-autoreload $autoreload

diff --git a/docker-compose.yml b/docker-compose.yml
index c2974e397acbaf78e596fca398a60e8afcc9ea53..65c4b0b8eff31efbba4803d4afc82b2cdf9ceac8 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -92,3 +92,4 @@ phpmyadmin:
     image: nazarpc/phpmyadmin
     links:
       - db:mysql
+