Correction : etc/skel/etc/mail/delivery.procmailrc : prend le bon champ GECOS pour...

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index 19ea6be..4e4e861 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -708,6 +708,14 @@ rule_mail_configure () {
  }
 rule_mysql_configure () {
        rule apt_get_install mysql-server-5.5
+       sudo install -m 644 -o root -g root \
+           "$tool"/etc/mysql/my.cnf \
+           /etc/mysql/my.cnf
+       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 () {
@@ -999,16 +1007,16 @@ rule_postfix_configure () {
         ../crt+crl.self-signed.pem \
         /etc/postfix/$vm_domainname/smtpd/x509/ca/crt.pem
        sudo install -m 400 -o root -g root \
-        "$tool"/var/pub/x509/smptd.$vm_domainname/crt+crl.self-signed.pem \
+        "$tool"/var/pub/x509/smtpd.$vm_domainname/crt+crl.self-signed.pem \
            /etc/postfix/$vm_domainname/smtpd/x509/crt+crl.self-signed.pem
        sudo install -m 400 -o root -g root \
-        "$tool"/var/pub/x509/smptd.$vm_domainname/crt.pem \
+        "$tool"/var/pub/x509/smtpd.$vm_domainname/crt.pem \
            /etc/postfix/$vm_domainname/smtpd/x509/crt.pem
        sudo install -m 400 -o root -g root \
-        "$tool"/var/pub/x509/smptd.$vm_domainname/crt+ca.pem \
+        "$tool"/var/pub/x509/smtpd.$vm_domainname/crt+ca.pem \
            /etc/postfix/$vm_domainname/smtpd/x509/crt+ca.pem
        sudo install -m 400 -o root -g root \
-        "$tool"/var/pub/x509/smptd.$vm_domainname/crt+crl.self-signed.pem \
+        "$tool"/var/pub/x509/smtpd.$vm_domainname/crt+crl.self-signed.pem \
            /etc/postfix/$vm_domainname/smtpd/x509/crt+crl.self-signed.pem
        sudo install -m 660 -o root -g root \
         "$tool"/etc/postfix/$vm_domainname/header_checks \
@@ -1019,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
@@ -1259,28 +1268,6 @@ rule_user_configure () {
                USERGROUPS=yes
                USERS_GID=100
                EOF
- }
-rule_user_admin_add () { # SYNTAX: $user
-       rule user_configure
-       local user=$1
-       getent passwd "$user" >/dev/null ||
-       sudo adduser --disabled-password "$user"
-       eval local home\; home="~$user"
-       sudo adduser "$user" sudo
-       sudo install -m 640 -o root -g root \
-        "$tool"/var/pub/ssh/"$user".key \
-        "$home"/etc/ssh/authorized_keys
-       local key; local -; set +f
-       for key in "$tool"/var/pub/openpgp/*.key
-        do sudo -u "$user" gpg --import - <"$key"
-        done
-       rule user_admin_configure
- }
-rule_user_admin_configure () {
-       rule initramfs_configure
-       rule user_root_configure
- }
-rule_user_configure () {
        sudo install -d -m 750 -o root -g root \
         /etc/skel \
         /etc/skel/etc \
@@ -1324,6 +1311,26 @@ rule_user_configure () {
         "$tool"/etc/screenrc \
                /etc/screenrc
  }
+rule_user_admin_add () { # SYNTAX: $user
+       rule user_configure
+       local user=$1
+       getent passwd "$user" >/dev/null ||
+       sudo adduser --disabled-password "$user"
+       eval local home\; home="~$user"
+       sudo adduser "$user" sudo
+       sudo install -m 640 -o root -g root \
+        "$tool"/var/pub/ssh/"$user".key \
+        "$home"/etc/ssh/authorized_keys
+       local key; local -; set +f
+       for key in "$tool"/var/pub/openpgp/*.key
+        do sudo -u "$user" gpg --import - <"$key"
+        done
+       rule user_admin_configure
+ }
+rule_user_admin_configure () {
+       rule initramfs_configure
+       rule user_root_configure
+ }
 rule_user_root_configure () {
        sudo install -d -m 750 -o root -g root \
         /root/etc \