Revert the somewhat unrelated mig log -> mig state log naming changes in PR75

as they may interfere with existing deployments. We should really rename the
migridX syslog volumes in LOG_ROOT to something syslog'ish instead to reduce
any confusion.
Use just 'log' for the mig state log volume name to fit with naming of all
other mig state subdirs.

Author: jonasbardino

Makefile

@@ -121,7 +121,7 @@ initdirs: initcomposevars
 	mkdir -p ${PERSISTENT_ROOT}/wwwpublic-vgrid
 	mkdir -p ${PERSISTENT_ROOT}/wwwpublic-download
 	mkdir -p ${PERSISTENT_ROOT}/secrets
-	mkdir -p ${LOG_ROOT}/migstatelog
+	mkdir -p ${LOG_ROOT}/miglog
 	mkdir -p ${LOG_ROOT}/migrid
 	mkdir -p ${LOG_ROOT}/migrid-io
 	mkdir -p ${LOG_ROOT}/migrid-openid

docker-compose_development.yml

@@ -63,7 +63,7 @@ services:
     env_file:
       - migrid-httpd.env
     # NOTE: public hosts should create users through sign up and run like this
-    command: /app/docker-entry.sh -V
+    command: /app/docker-entry.sh -V -c
 
   # The migrid core services including httpd and tightly integrated services
   # like job handling (grid script, monitor, sshmux, imnoty and vmproxy)
@@ -121,7 +121,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -181,7 +181,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: we don't need read-only vgrids/workgroups in the openid container
       # NOTE: mig_system_run is a shared volatile cache which gains from using host tmpfs
@@ -227,7 +227,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -277,7 +277,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -326,7 +326,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -408,6 +408,14 @@ volumes:
 
   # NOTE: we don't bother setting up persistent data outside state here
 
+  log:
+    # Volume used to contain the mig state log folder shared by all containers
+    driver: local
+    driver_opts:
+      type: none
+      device: ${LOG_ROOT}/miglog
+      o: bind
+
   migrid-syslog:
     # Volume used for exposing migrid container system log
     driver: local
@@ -447,11 +455,3 @@ volumes:
       type: none
       device: ${LOG_ROOT}/migrid-ftps
       o: bind
-
-  migstate-log:
-    # Volume used to contain the migrid state log
-    driver: local
-    driver_opts:
-      type: none
-      device: ${LOG_ROOT}/migstatelog
-      o: bind

docker-compose_development_gdp.yml

@@ -121,7 +121,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -185,7 +185,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: we don't need read-only vgrids/workgroups in the openid container
       # NOTE: mig_system_run is a shared volatile cache which gains from using host tmpfs
@@ -231,7 +231,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -281,7 +281,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -330,7 +330,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       # NOTE: for read-only vgrids/workgroups we need a local 'ro' bind-mount
       - type: bind
@@ -411,9 +411,17 @@ volumes:
       type: none
       device: ${DOCKER_MIGRID_ROOT}/state
       o: bind
-  
+
   # NOTE: we don't bother setting up persistent data outside state here
 
+  log:
+    # Volume used to contain the mig state log folder shared by all containers
+    driver: local
+    driver_opts:
+      type: none
+      device: ${LOG_ROOT}/miglog
+      o: bind
+
   migrid-syslog:
     # Volume used for exposing migrid container system log
     driver: local
@@ -453,11 +461,3 @@ volumes:
       type: none
       device: ${LOG_ROOT}/migrid-ftps
       o: bind
-
-  migstate-log:
-    # Volume used to contain the migrid state log
-    driver: local
-    driver_opts:
-      type: none
-      device: ${LOG_ROOT}/migstatelog
-      o: bind

docker-compose_production_bind.yml

@@ -102,7 +102,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       - type: volume
         source: secrets
@@ -228,7 +228,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       - type: volume
         source: secrets
@@ -347,7 +347,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       - type: volume
         source: secrets
@@ -465,7 +465,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       - type: volume
         source: secrets
@@ -583,7 +583,7 @@ services:
         source: state
         target: /home/mig/state
       - type: volume
-        source: migstate-log
+        source: log
         target: /home/mig/state/log
       - type: volume
         source: secrets
@@ -935,6 +935,14 @@ volumes:
       device: ${PERSISTENT_ROOT}/vgrid_files_writable
       o: bind
 
+  log:
+    # Volume used to contain the mig state log folder shared by all containers
+    driver: local
+    driver_opts:
+      type: none
+      device: ${LOG_ROOT}/miglog
+      o: bind
+
   migrid-syslog:
     # Volume used for exposing migrid container system log
     driver: local
@@ -974,11 +982,3 @@ volumes:
       type: none
       device: ${LOG_ROOT}/migrid-ftps
       o: bind
-
-  migstate-log:
-    # Volume used to contain the migrid state log
-    driver: local
-    driver_opts:
-      type: none
-      device: ${LOG_ROOT}/migstatelog
-      o: bind