merge dir perms and owners code, add refresh_dirs.sh script

web/add_site.sh

@@ -29,18 +29,14 @@ cd /etc/httpd2/conf/sites-enabled || exit
 umask u=rwx,g=rwx,o=x
 
 if [ ! -d "$LOGDIR" ] ; then
-	mkdir -p $LOGDIR $HOSTBASE $SESSIONDIR
-	chown -R $2:webmaster /home/$2
-	chmod g+rwx /home/$2
-	chmod g+s /home/$2
-	chmod g-w /home/$2
-	chmod o-rwx /home/$2 /home/$2/www
-	chown -R root:root $LOGDIR
-	chmod 0755 $LOGDIR
+	# create all dir from scratch
+	set_dirperms
 fi
 
 #mkdir -p $SITE/cgi
-mkdir -p $SITEDIR
+mkdir -p $SITEDIR $SESSIONDIR
+chown $USERNAME $SESSIONDIR/
+
 #mkdir -p $LOGDIR
 #test -f $SITE/favicon.ico || cp -f ./favicon.ico $SITE/favicon.ico
 test -f $SITEDIR/favicon.ico || touch $SITEDIR/favicon.ico
@@ -58,6 +54,7 @@ create_site_config
 
 service httpd2 reload
 
-service httpd2 status && echo OK
+# starthttpd2 forces run httpd2
+service httpd2 status || starthttpd2
 
 echo "You can use technical name: $TECHNAME.$TECHHOST for access to the site."

web/functions

@@ -13,6 +13,33 @@ set_vars()
     SITEDIR=$HOSTBASE/$DOMAINNAME
 }
 
+set_dirperms()
+{
+
+# TODO: merge with add_site
+    # home
+    mkdir -p $HOMEDIR
+    chown -v $USERNAME:webmaster $HOMEDIR
+    chmod -v 0750 $HOMEDIR
+    chmod -v g-s $HOMEDIR
+
+    # www
+    mkdir -p $HOSTBASE
+    chown root:webmaster $HOSTBASE
+    chmod -v 0775 $HOSTBASE
+    chmod -v g-s $HOSTBASE
+
+    # www/sites
+    chown $USERNAME:webmaster $HOSTBASE/*
+    chmod -v 0770 $HOSTBASE/*
+    chmod -v g+s $HOSTBASE/*
+
+    # log
+    mkdir -p $LOGDIR
+    chown -R -v root:apache2 $LOGDIR
+    chmod -v 0755 $LOGDIR
+}
+
 check_dir()
 {
     local dir=$1

web/refresh_dirs.sh

+#!/bin/sh
+
+. ./config
+. ./functions
+. ./functions-apache
+
+cd /home || exit
+
+LISTUSER="*"
+[ -n "$*" ] && LISTUSER="$*"
+
+for USERNAME in $LISTUSER ; do
+    echo $USERNAME
+
+    set_vars
+
+    set_dirperms
+done

web/refresh_site_conf.sh

@@ -24,8 +24,9 @@ for i in $LISTCONF ; do
     ALIASLIST=$(get_aliaslist $i)
     [ -z "$ALIASLIST" ] || echo "   Alias list: $ALIASLIST"
 
-    mkdir -p $SESSIONDIR/
-    chown $USERNAME $SESSIONDIR/
+    # one time fix
+    #mkdir -p $SESSIONDIR/
+    #chown $USERNAME $SESSIONDIR/
 
     check_dirs