changeset 1598:073a75bf07fb dockerise

Pull out directory creation to its own script, fix ownership

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/provision.d/115-other-dirs.sh	Wed Aug 23 11:32:17 2017 +0100
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+# Initialise directories used as targets for cron activity (if they
+# don't already exist)
+
+# Reminder: the webapp directory is owned and run by the code user, in
+# group www-data. The repos and other things served directly are
+# usually the other way around -- owned by the www-data user, in group
+# code. I don't recall whether there is a good reason for this.
+
+for dir in \
+    /var/files/backups \
+    /var/doc \
+    /var/files/git-mirror ; do
+    if [ ! -d "$dir" ]; then
+        mkdir -p "$dir"
+        chown -R code.www-data "$dir"
+        chmod g+s "$dir"
+    fi
+done
+
+for dir in \
+    /var/mirror ; do
+    if [ ! -d "$dir" ]; then
+        mkdir -p "$dir"
+        chown -R www-data.code "$dir"
+        chmod g+s "$dir"
+    fi
+done

--- a/deploy/provision.d/140-cron.sh	Fri Aug 18 22:02:54 2017 +0100
+++ b/deploy/provision.d/140-cron.sh	Wed Aug 23 11:32:17 2017 +0100
@@ -2,20 +2,6 @@
 
 set -e
 
-# Initialise directories used as targets for cron activity (if they
-# don't already exist)
-
-for dir in \
-    /var/files/backups \
-    /var/doc \
-    /var/files/git-mirror ; do
-    if [ ! -d "$dir" ]; then
-        mkdir -p "$dir"
-        chown -R code.www-data "$dir"
-        chmod g+s "$dir"
-    fi
-done
-
 # Copy cron scripts to the appropriate destinations
 
 cd /var/www/code