set the permissions properly for installer

diff --git a/plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php b/plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php
index c871c2328e34757c68beaf0e51cab879f4520612..b2042abe947630542cd227665526dde0183ece42 100644 (file)
--- a/plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php
+++ b/plugins/DomainStatusNetwork/domainstatusnetworkinstaller.php
@@ -212,7 +212,23 @@ class DomainStatusNetworkInstaller extends Installer
 
         foreach (array('AVATARBASE', 'BACKGROUNDBASE', 'FILEBASE') as $key) {
             $base = $config[$key];
-            mkdir($base.'/'.$this->nickname, 0777, true);
+            $dirname = $base.'/'.$this->nickname;
+
+            // Make sure our bits are set
+            $mask = umask(0);
+            mkdir($dirname, 0770, true);
+            umask($mask);
+
+            // If you set the setuid bit on your base dirs this should be
+            // unnecessary, but just in case. You must be root for this
+            // to work.
+
+            if (array_key_exists('WEBUSER', $config)) {
+                chown($dirname, $config['WEBUSER']);
+            }
+            if (array_key_exists('WEBGROUP', $config)) {
+                chgrp($dirname, $config['WEBGROUP']);
+            }
         }
     }
 

diff --git a/scripts/setup.cfg.sample b/scripts/setup.cfg.sample
index f247a3bcae0e6910eb709bfddee23fd61682014a..049cd3e8595cc9f63ffc62d99924f16c24ed443f 100644 (file)
--- a/scripts/setup.cfg.sample
+++ b/scripts/setup.cfg.sample
@@ -16,3 +16,5 @@ export WILDCARD=example.net
 export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt
 export MAILSUBJECT="Your new StatusNet site"
 export POSTINSTALL=/etc/statusnet/morestuff.sh
+export WEBUSER=www-data
+export WEBGROUP=www-data