An alternative integration of the mig server config extension snippets like PR105 using bind mount (#106)

An alternative integration of the mig server config extension snippets like PR #105 but using a bind mounted volume in `PERSISTENT_ROOT` for the config snippets instead as agreed in the PR discussion. This will enable easy adjustment of e.g. the `CLOUD_X` sections where user access and such may need more frequent updates than what is feasible to handle with rebuild/redeploy every time.

Author: jonasbardino

Makefile

@@ -129,6 +129,7 @@ initdirs: initcomposevars
 mkdir -p ${PERSISTENT_ROOT}/wwwpublic-vgrid
 mkdir -p ${PERSISTENT_ROOT}/wwwpublic-download
 mkdir -p ${PERSISTENT_ROOT}/secrets
+mkdir -p ${PERSISTENT_ROOT}/mig-server-extconfs
 mkdir -p ${LOG_ROOT}/miglog
 mkdir -p ${LOG_ROOT}/syslog/migrid
 mkdir -p ${LOG_ROOT}/syslog/migrid-io

docker-compose_production.yml

@@ -41,6 +41,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: certs
  target: /etc/httpd/MiG-certificates
@@ -92,6 +95,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: certs
  target: /etc/httpd/MiG-certificates
@@ -227,6 +233,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: certs
  target: /etc/httpd/MiG-certificates
@@ -356,6 +365,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: certs
  target: /etc/httpd/MiG-certificates
@@ -484,6 +496,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: certs
  target: /etc/httpd/MiG-certificates
@@ -612,6 +627,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: certs
  target: /etc/httpd/MiG-certificates
@@ -740,6 +758,9 @@ services:
  - type: volume
  source: mig
  target: /home/mig/mig
+ - type: volume
+ source: mig-server-extconfs
+ target: /home/mig/mig/server/MiGserver.d
  - type: volume
  source: migrid-lustre-quota-syslog
  target: /var/log
@@ -816,6 +837,14 @@ volumes:
  device: ${DOCKER_MIGRID_ROOT}/mig
  o: bind
 
+ mig-server-extconf:
+ # Volume used to contain the optional additional mig server config snippets
+ driver: local
+ driver_opts:
+ type: none
+ device: ${PERSISTENT_ROOT}/mig-server-extconfs
+ o: bind
+
  state:
  # Volume used to contain the migrid state (provided by migrid)
  driver: local