Merge branch 'daemon-rework' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into daemon-rework

.env.tpl

@@ -120,6 +120,10 @@ NOPAQUE_ADMIN=
 #       Swarm nodes
 # NOPAQUE_DATA_DIR=
 
+# CHOOSE ONE: False, True
+# DEFAULT: False
+# NOPAQUE_DAEMON_ENABLED=
+
 # DEFAULT: 0.0.0.0
 # NOPAQUE_HOST=
 

web/Dockerfile

@@ -17,7 +17,6 @@ RUN apt-get update \
  && apt-get install --no-install-recommends --yes \
       build-essential \
       libpq-dev \
-      wait-for-it \
  && rm -r /var/lib/apt/lists/*
 
 

web/app/models.py

@@ -35,7 +35,7 @@ class Role(db.Model):
     # Fields
     default = db.Column(db.Boolean, default=False, index=True)
     name = db.Column(db.String(64), unique=True)
-    permissions = db.Column(db.BigInteger)
+    permissions = db.Column(db.Integer)
     # Relationships
     users = db.relationship('User', backref='role', lazy='dynamic')
 

web/boot.sh

@@ -1,21 +1,26 @@
 #!/bin/bash
+
+if [[ "${NOPAQUE_DAEMON_ENABLED}" == "True" ]]; then
+    echo "Starting nopaque daemon..."
+    ./nopaque-daemon.sh &
+fi
+
 source venv/bin/activate
 
+if [[ "${#}" -eq 0 ]]; then
     while true; do
         flask deploy
-    if [[ "$?" == "0" ]]; then
+        if [[ "${?}" == "0" ]]; then
             break
         fi
         echo Deploy command failed, retrying in 5 secs...
         sleep 5
     done
-
-if [[ "$#" -eq 0 ]]; then
     python nopaque.py
-elif [[ "$1" == "flask" ]]; then
+elif [[ "${1}" == "flask" ]]; then
     exec ${@:1}
 else
-    echo "$0 [COMMAND]"
+    echo "${0} [COMMAND]"
     echo ""
     echo "nopaque startup script"
     echo ""

web/nopaque-daemon.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+source venv/bin/activate
+
+while true; do
+    flask tasks
+    sleep 10
+done