Merge branch '3.1.x' into patch-5

.dockerignore

@@ -12,3 +12,10 @@ bower
 .travis.yml
 .env
 .idea
+.DS_Store
+.coveragerc
+*.swp
+.coveragerc
+.drone.yml
+.github
+release.sh

docker/docker-compose.yaml

@@ -33,11 +33,11 @@ services:
     networks:
       - sapl-net
   sapl:
-    image: interlegis/sapl:3.1.164-RC3
-#    build:
-#      context: ../
-#      dockerfile: ./docker/Dockerfile
-#    container_name: sapl
+#    image: interlegis/sapl:3.1.164-RC3
+    build:
+      context: ../
+      dockerfile: ./docker/Dockerfile
+    container_name: sapl
     labels:
        NAME: "sapl"
     restart: always

docker/startup_scripts/start.sh

@@ -4,19 +4,16 @@ IFS=$'\n\t'
 
 APP_DIR="/var/interlegis/sapl"
 DATA_DIR="/var/interlegis/sapl/data"
-MEDIA_DIR="/var/interlegis/sapl/media"
 RUN_DIR="/var/interlegis/sapl/run"
 
 ENV_FILE="$APP_DIR/.env"
 SECRET_FILE="$DATA_DIR/secret.key"
 
 chown -R root:nginx "$RUN_DIR" || true
-chown -R root:nginx "$MEDIA_DIR" || true
 chmod -R g+rwX "$RUN_DIR" || true
-chmod -R g+rwX "$MEDIA_DIR" || true
 
 # setgid bit on our writable trees (not data/)
-find "$RUN_DIR" "$MEDIA_DIR" -type d -exec chmod g+s {} + 2>/dev/null || true
+find "$RUN_DIR" -type d -exec chmod g+s {} + 2>/dev/null || true
 
 log() { printf '[%s] %s\n' "$(date -Is)" "$*"; }
 err() { printf '[%s] ERROR: %s\n' "$(date -Is)" "$*" >&2; }

scripts/gunicorn_start.sh

@@ -15,8 +15,8 @@ then
 fi
 
 NAME="SAPL"                                     # Name of the application (*)
-DJANGODIR=$SAPL_DIR/                            # Django project directory (*)
-SOCKFILE=$SAPL_DIR/run/gunicorn.sock            # we will communicate using this unix socket (*)
+DJANGODIR="$SAPL_DIR/"                          # Django project directory (*)
+SOCKFILE="$SAPL_DIR/run/gunicorn.sock"          # we will communicate using this unix socket (*)
 USER=`whoami`                                   # the user to run as (*)
 GROUP=`whoami`                                  # the group to run as (*)
 NUM_WORKERS=3                                   # how many worker processes should Gunicorn spawn (*)