addsite: Give webmasters write access to the data dir.

[matthijs/servers/drsnuggles.git] / usr / local / bin / addsite

diff --git a/usr/local/bin/addsite b/usr/local/bin/addsite
index c0ecae848afa8d75c7593ea68fad33f5cac4474d..73eb5d39854ed366a6665c16a2b2002f47a4ac7c 100755 (executable)
--- a/usr/local/bin/addsite
+++ b/usr/local/bin/addsite
@@ -21,16 +21,25 @@ PHP_CONFIG=conf/php.ini.override
 # PHP error logfile to set error_log to
 PHP_ERRORLOG=logs/php.log
 
-# Get dir, but make it absolute
-cd "$1"
-DIR=`pwd`
-
+# Get dir
+DIR="$1"
 
-if [ -e "$DIR" -a ! -d "$DIR" ]; then
-       echo "$DIR" must be a directory, or not exist yet.
-       exit 1;
+if [ -e "$DIR" ]; then
+       if [ ! -d "$DIR" ]; then
+               echo "$DIR" must be a directory, or not exist yet.
+               exit 1;
+       fi
+       echo "Skipping creation of $DIR, it already exists";
+else
+       # Create $DIR from $TEMPLATE_DIR, if it does not exist yet
+       echo "Creating $DIR from $TEMPLATE_DIR"
+       cp -R "$TEMPLATE_DIR" "$DIR"
 fi
 
+# Make $DIR absolute
+cd "$DIR"
+DIR=`pwd`
+
 # Strip prefix
 SITE=`basename $DIR`
 
@@ -77,14 +86,6 @@ else
        exit 1
 fi
 
-if [ -e "$DIR" ]; then
-       echo "Skipping creation of $DIR, it already exists";
-else
-       # Create $DIR from $TEMPLATE_DIR, if it does not exist yet
-       echo "Creating $DIR from $TEMPLATE_DIR"
-       cp -R "$TEMPLATE_DIR" "$DIR"
-fi
-
 echo "Setting up permissions"
 # Set up permissions
 sudo chown -R 0:$GROUP "$DIR"
@@ -92,8 +93,8 @@ sudo chown -R 0:$GROUP "$DIR"
 # By default, let the owner have write access, the group have read access
 sudo setfacl -R --set d:u::rwX,d:g::rX,d:o::-,u::rwX,g::rX,o::- "$DIR"
 
-# Give the group write access to htdocs, applications and conf
-sudo setfacl -R -m g::rwX "$DIR/htdocs" "$DIR/applications" "$DIR/conf"
+# Give the group write access to htdocs, applications, conf and data
+sudo setfacl -R -m g::rwX "$DIR/htdocs" "$DIR/applications" "$DIR/conf" "$DIR/data"
 
 # Give lighttpd read access to the dir itself
 sudo setfacl -m u:$HTTPD_USER:rx "$DIR"