[indico-web] Use single persistent volume for custom and archive directories

[Bartłomiej Piotrowski <bpiotrowski src gnome org>]

commit e1aa59b6011cc372a9a7003ab3f4b1a16fdee64b
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Thu Nov 28 09:53:21 2019 +0100

    Use single persistent volume for custom and archive directories

 oscp.yml             | 55 ++--------------------------------------------------
 worker/Dockerfile    |  2 +-
 worker/indico.conf   |  4 ++--
 worker/run_celery.sh |  4 ++++
 worker/run_indico.sh |  5 +++++
 5 files changed, 14 insertions(+), 56 deletions(-)
---
diff --git a/oscp.yml b/oscp.yml
index d6c34c8..2ef8a9e 100644
--- a/oscp.yml
+++ b/oscp.yml
@@ -84,67 +84,16 @@ objects:
       referencePolicy:
         type: Source
 
-### Persistent Volume claims
-
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    creationTimestamp: null
-    labels:
-      io.kompose.service: indico-web-claim0
-    name: indico-web-claim0
-  spec:
-    accessModes:
-    - ReadWriteOnce
-    resources:
-      requests:
-        storage: 100Mi
-  status: {}
-
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    creationTimestamp: null
-    labels:
-      io.kompose.service: indico-web-claim1
-    name: indico-web-claim1
-  spec:
-    accessModes:
-    - ReadWriteOnce
-    resources:
-      requests:
-        storage: 100Mi
-  status: {}
-
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    creationTimestamp: null
-    labels:
-      io.kompose.service: customization
-    name: customization
-  spec:
-    accessModes:
-    - ReadWriteOnce
-    resources:
-      requests:
-        storage: 100Mi
-  status: {}
-
 - apiVersion: v1
   kind: PersistentVolumeClaim
   metadata:
-    creationTimestamp: null
-    labels:
-      io.kompose.service: indico-redis-claim0
-    name: indico-redis-claim0
+    name: indico-data
   spec:
     accessModes:
     - ReadWriteOnce
     resources:
       requests:
-        storage: 100Mi
-  status: {}
+        storage: 1Gi
 
 ### Deployment configurations
 
diff --git a/worker/Dockerfile b/worker/Dockerfile
index bc92a17..a2a9b1c 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update && \
 COPY --from=builder /opt/indico /opt/indico
 
 ENV INDICO_VIRTUALENV="/opt/indico/venv"
-RUN ["/bin/bash", "-c", "mkdir -p --mode=775 /opt/indico/{etc,tmp,log,cache,archive}"]
+RUN ["/bin/bash", "-c", "mkdir -p --mode=775 /opt/indico/{etc,tmp,log,cache,data}"]
 RUN ${INDICO_VIRTUALENV}/bin/indico setup create-symlinks /opt/indico && \
     ${INDICO_VIRTUALENV}/bin/indico setup create-logging-config /opt/indico/etc
 COPY indico.conf logging.yaml /opt/indico/etc/
diff --git a/worker/indico.conf b/worker/indico.conf
index 769d864..ef92ae8 100644
--- a/worker/indico.conf
+++ b/worker/indico.conf
@@ -40,10 +40,10 @@ DEFAULT_LOCALE = os.environ.get('INDICO_DEFAULT_LOCALE') or 'en_GB'
 
 CELERY_BROKER = os.environ['CELERY_BROKER']
 
-STORAGE_BACKENDS = ast.literal_eval(os.environ.get('INDICO_STORAGE_DICT', 'None')) or {'default': 
'fs:/opt/indico/archive'}
+STORAGE_BACKENDS = {'default': 'fs:/opt/indico/data/archive'}
 ATTACHMENT_STORAGE = os.environ.get('ATTACHMENT_STORAGE') or 'default'
 
-CUSTOMIZATION_DIR = os.environ.get('INDICO_CUSTOMIZATION_DIR') or '/opt/indico/custom'
+CUSTOMIZATION_DIR = '/opt/indico/data/custom'
 CUSTOMIZATION_DEBUG = os.environ.get('INDICO_CUSTOMIZATION_DEBUG') or False
 LOGO_URL = os.environ.get('INDICO_LOGO_URL') or ''
 
diff --git a/worker/run_celery.sh b/worker/run_celery.sh
index ca72f17..c54ce4b 100644
--- a/worker/run_celery.sh
+++ b/worker/run_celery.sh
@@ -3,6 +3,10 @@
 /opt/indico/set_user.sh
 . /opt/indico/.venv/bin/activate
 
+for path in /opt/indico/data/{archive,custom}; do
+    [[ ! -d $path ]] && mkdir -p $path
+done
+
 echo 'Waiting for indico-web to be online...'
 while [[ "$(curl -L --max-time 10 -s -o /dev/null -w ''%{http_code}'' 'http://indico-web:59999')" != "200" 
]]; do
     sleep 10;
diff --git a/worker/run_indico.sh b/worker/run_indico.sh
index 1757b9e..9c3411a 100644
--- a/worker/run_indico.sh
+++ b/worker/run_indico.sh
@@ -3,6 +3,11 @@
 /opt/indico/set_user.sh
 . /opt/indico/.venv/bin/activate
 
+
+for path in /opt/indico/data/{archive,custom}; do
+    [[ ! -d $path ]] && mkdir -p $path
+done
+
 psql indico -lqt | cut -d \| -f 1 | grep -qw indico
 
 until [ $? -eq 0 ]; do