mv data to var (apply scripts/fs_migrate.sh before start)

diff --git a/.gitmodules b/.gitmodules
index f6625c9eb1aec782ed3dacd04f0fab2e724425e6..5e770e600518d4f9b4f566acda85ed07e2f2bee2 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 [submodule "lib/mezzanine-agenda"]
        path = lib/mezzanine-agenda
        url = git+ssh://git@git.forge.ircam.fr/mezzanine-agenda.git
-[submodule "data"]
-       path = data
+[submodule "var"]
+       path = var
        url = git+ssh://git@git.forge.ircam.fr/ircam-www-data.git
 [submodule "lib/mezzanine"]
        path = lib/mezzanine

diff --git a/docker-compose.yml b/docker-compose.yml
index 5d28f3a5455bc0a999afe10cd3c291f5b935a9ca..adbde559ed3257dacabba9781fa12d19df8b2b15 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,12 +18,11 @@
 # Authors:
 # Guillaume Pellerin <guillaume.pellerin@ircam.fr>
 
-
-data:
+var:
   image: debian:jessie
   volumes:
-    - ./data/media/:/srv/media
-    - ./data/backup/:/srv/backup
+    - ./var/media:/srv/media
+    - ./var/backup:/srv/backup
     - /srv/static
     - /srv/bower
   command: "true"
@@ -31,11 +30,10 @@ data:
 db:
   image: postgres:9.5
   volumes_from:
-    - data
+    - var
   volumes:
-    - ./scripts/:/srv/scripts
-    - ./data/postgresql/data/:/var/lib/postgresql/data
-    # - ./data/var/log/postgresql/:/var/log/postgresql
+    - ./scripts:/srv/scripts
+    - ./var/lib/postgresql/data:/var/lib/postgresql/data
   environment:
     - POSTGRES_PASSWORD=hyRob0otlaz4
 
@@ -43,16 +41,16 @@ app:
   build: .
   command: /bin/bash scripts/app.sh
   volumes:
-    - ./app/:/srv/app
-    - ./data/var/log/uwsgi/:/var/log/uwsgi
-    - ./lib/grappelli-safe/:/srv/lib/grappelli-safe
-    - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda
-    - ./lib/django-eve/:/srv/lib/django-eve
-    - ./lib/django-prestashop/:/srv/lib/django-prestashop
+    - ./app:/srv/app
+    - ./var/log/uwsgi:/var/log/uwsgi
+    - ./lib/grappelli-safe:/srv/lib/grappelli-safe
+    - ./lib/mezzanine-agenda:/srv/lib/mezzanine-agenda
+    - ./lib/django-eve:/srv/lib/django-eve
+    - ./lib/django-prestashop:/srv/lib/django-prestashop
     # - ./lib/mezzanine/:/srv/lib/mezzanine
     # - ./lib/cartridge/:/srv/lib/cartridge
   volumes_from:
-    - data
+    - var
   expose:
     - "8000"
   links:
@@ -65,9 +63,9 @@ nginx:
   ports:
     - "8020:80"
   volumes:
-    - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf
-    - ./data/var/log/nginx/:/var/log/nginx
+    - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+    - ./var/log/nginx/:/var/log/nginx
   volumes_from:
-    - data
+    - var
   links:
     - app

diff --git a/etc/nginx.conf b/etc/nginx.conf
deleted file mode 100644 (file)
index decdcff..0000000
--- a/etc/nginx.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-server_tokens off;
-
-server {
-       listen 80;
-       charset utf-8;
-
-       access_log /var/log/nginx/app-access.log;
-       error_log /var/log/nginx/app-error.log;
-
-       # max upload size
-       client_max_body_size 4096M; # adjust to taste
-
-       # Django media
-       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
-       }
-
-       location / {
-            uwsgi_pass app:8000;
-            include /etc/nginx/uwsgi_params;
-       }
-}

diff --git a/scripts/fs_migrate.sh b/scripts/fs_migrate.sh
new file mode 100755 (executable)
index 0000000..9dbfeab
--- /dev/null
+++ b/scripts/fs_migrate.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+docker-compose stop
+mv data var
+mkdir var/lib
+sudo mv var/postgresql var/lib
+sudo mv var/external var/opt
+sudo mv var/var/log var
+sudo rm -rf var/var
+mkdir etc/nginx
+mkdir etc/nginx/conf.d/
+mv etc/nginx.conf etc/nginx/conf.d/default.conf
+mkdir etc/apt
+mv etc/sources.list etc/apt/

diff --git a/scripts/pull.sh b/scripts/pull.sh
index b300ab619d1127848de8c89460af79d428c27a68..69c38832af92dace23e88486d47ab627e77214d3 100755 (executable)
--- a/scripts/pull.sh
+++ b/scripts/pull.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-sudo chown -R $USER data/media
-sudo chown -R $USER data/backup
+sudo chown -R $USER var/media
+sudo chown -R $USER var/backup
 git pull
 git submodule foreach git pull
 docker-compose run db /srv/scripts/restore_db.sh

diff --git a/scripts/push.sh b/scripts/push.sh
index 5fe08c4d9d62a4c0ba7cc0eeaa415b9224d873c5..872d2eba739a2ea4db653e930be98fb9ab8cbe54 100755 (executable)
--- a/scripts/push.sh
+++ b/scripts/push.sh
@@ -3,7 +3,7 @@
 echo "----------------------------"
 echo `date +\%Y\%m\%d-\%H-\%M-\%S`
 docker-compose run db /srv/scripts/backup_db.sh
-cd data
+cd var
 git add .
 git commit -a -m "update DB and media"
 git pull origin master