Add 'quota_home' to PERSISTENT_ROOT (#96)

Quota information should be persistent through re-deployment

Author: Martin-Rehr

Makefile

@@ -109,6 +109,7 @@ initdirs: initcomposevars
 	mkdir -p ${PERSISTENT_ROOT}/sharelink_home
 	mkdir -p ${PERSISTENT_ROOT}/events_home
 	mkdir -p ${PERSISTENT_ROOT}/sitestats_home
+	mkdir -p ${PERSISTENT_ROOT}/quota_home
 	mkdir -p ${PERSISTENT_ROOT}/sandbox_home
 	mkdir -p ${PERSISTENT_ROOT}/sss_home
 	mkdir -p ${PERSISTENT_ROOT}/workflows_db_home

development.env

@@ -110,6 +110,7 @@ ENABLE_CRONTAB=True
 ENABLE_JOBS=True
 ENABLE_RESOURCES=True
 ENABLE_EVENTS=True
+ENABLE_QUOTA=False
 ENABLE_GRAVATARS=True
 ENABLE_SITESTATUS=True
 STATUS_SYSTEM_MATCH=ANY

development_gdp.env

@@ -110,6 +110,7 @@ ENABLE_CRONTAB=False
 ENABLE_JOBS=False
 ENABLE_RESOURCES=False
 ENABLE_EVENTS=False
+ENABLE_QUOTA=False
 ENABLE_GRAVATARS=False
 ENABLE_SITESTATUS=True
 STATUS_SYSTEM_MATCH=ANY

docker-compose_production.yml

@@ -139,6 +139,9 @@ services:
       - type: volume
         source: sitestats_home
         target: /home/mig/state/sitestats_home
+      - type: volume
+        source: quota_home
+        target: /home/mig/state/quota_home
       - type: volume
         source: sandbox_home
         target: /home/mig/state/sandbox_home
@@ -272,6 +275,9 @@ services:
       #  source: sitestats_home
       #  target: /home/mig/state/sitestats_home
       #- type: volume
+      #  source: quota_home
+      #  target: /home/mig/state/quota_home
+      #- type: volume
       #  source: sandbox_home
       #  target: /home/mig/state/sandbox_home
       #- type: volume
@@ -398,6 +404,9 @@ services:
       #  source: sitestats_home
       #  target: /home/mig/state/sitestats_home
       #- type: volume
+      #  source: quota_home
+      #  target: /home/mig/state/quota_home
+      #- type: volume
       #  source: sandbox_home
       #  target: /home/mig/state/sandbox_home
       #- type: volume
@@ -523,6 +532,9 @@ services:
       #  source: sitestats_home
       #  target: /home/mig/state/sitestats_home
       #- type: volume
+      #  source: quota_home
+      #  target: /home/mig/state/quota_home
+      #- type: volume
       #  source: sandbox_home
       #  target: /home/mig/state/sandbox_home
       #- type: volume
@@ -648,6 +660,9 @@ services:
       #  source: sitestats_home
       #  target: /home/mig/state/sitestats_home
       #- type: volume
+      #  source: quota_home
+      #  target: /home/mig/state/quota_home
+      #- type: volume
       #  source: sandbox_home
       #  target: /home/mig/state/sandbox_home
       #- type: volume
@@ -728,6 +743,9 @@ services:
       - type: volume
         source: state
         target: /home/mig/state
+      - type: volume
+        source: quota_home
+        target: /home/mig/state/quota_home
     command: miglustrequota.py -c /home/mig/mig/server/MiGserver.conf
 
 # NOTE: not used in stand-alone production mode
@@ -873,6 +891,14 @@ volumes:
       device: ${PERSISTENT_ROOT}/sitestats_home
       o: bind
 
+  quota_home:
+    # Volume used to contain the migrid quota_home
+    driver: local
+    driver_opts:
+      type: none
+      device: ${PERSISTENT_ROOT}/quota_home
+      o: bind
+
   sandbox_home:
     # Volume used to contain the migrid sandbox_home
     driver: local

production.env

@@ -110,6 +110,7 @@ ENABLE_CRONTAB=True
 ENABLE_JOBS=True
 ENABLE_RESOURCES=True
 ENABLE_EVENTS=True
+ENABLE_QUOTA=False
 ENABLE_GRAVATARS=True
 ENABLE_SITESTATUS=True
 STATUS_SYSTEM_MATCH=ANY