Correction : vm_hosted : rule_www_configure .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 46aa6af..3247eb5 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -208,7 +208,7 @@ rule_apache2_configure () {
                 /etc/apache2/site.d/"$site" \
                 /home/www/etc/apache2/"$site"
                test -e /home/www/pub/"$site" ||
-               sudo install -d -m 770 -o www."$site" -g www."$site" \
+               sudo install -d -m 2770 -o www."$site" -g www."$site" \
                 /home/www/pub/"$site"
                getent passwd www."$site" >/dev/null ||
                sudo adduser \
@@ -711,8 +711,11 @@ rule_mysql_configure () {
        sudo install -m 644 -o root -g root \
            "$tool"/etc/mysql/my.cnf \
            /etc/mysql/my.cnf
-       sudo install -d -m 750 -o mysql -g mysql \
-        /home/mysql
+       if test ! -d /home/mysql; then
+           sudo install -d -m 750 -o mysql -g mysql \
+               /home/mysql
+           sudo -u mysql mysql_install_db --no-defaults --datadir=/home/mysql/
+       fi
        sudo service mysql restart
  }
 rule_network_configure () {
@@ -783,7 +786,7 @@ rule_www_configure () {
        sudo install -d -m 750 -o www -g www \
         /home/www/etc
        sudo install -d -m 1771 -o www-data -g www-data \
-        /home/www/pub \
+        /home/www/pub
        sudo install -d -m 1771 -o log.www -g log.www \
         /home/www/log
  }
@@ -1024,6 +1027,7 @@ rule_postfix_configure () {
                abuse: root
                admin: root
                contact: root
+               mailer-daemon: root
                postmaster: root
                root: $(getent group sudo | cut -f 4 -d : | tr , ' ')
                EOF