Correction : vm_hosted : rule_dovecot_configure : sudo .
[lhc/ateliers.git] / vm_hosted
index 2e4dc08..6e43c25 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -55,6 +55,181 @@ rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ?
        . /etc/profile
  }
 
+rule_apache2_configure () {
+       local -; set +f
+       rule apt_get_install \
+        apache2-mpm-itk \
+        libapache2-mod-php5
+               # VOIR: http://serverfault.com/questions/383526/how-do-i-select-which-apache-mpm-to-use/383634#383634
+               # VOIR: http://jkroon.blogs.uls.co.za/it/security/using-php-fpm-and-mod_proxy_fcgi-to-optimize-and-secure-lamp-servers
+               # NOTE: apache2-mpm-itk semble le plus sécurisé,
+               # car on est certain que tout est exécuté avec les uid/gid
+               # assignés au VirtualHost/Directory/Location
+               # néamoins il se peut qu'une combinaison du genre :
+               # apache2-mpm-{worker,event} + mod_proxy_fcgi + apache2-suexec-custom + php-fpm
+               # soit plus performante (threads et pas forks),
+               # cependant l'usage de suexec impose des forks il semble..
+               # et mod_proxy_fcgi n'apparaît que dans apache 2.4 ;
+               # donc pour l'instant : apache2-mpm-itk
+       rule www_configure
+       cat /dev/stdin "$tool"/etc/apache2/apache2.conf <<-EOF |
+               ServerName "$vm_fqdn"
+               EOF
+       sudo install -m 660 -o root -g root /dev/stdin \
+        /etc/apache2/apache2.conf
+       sudo install -m 660 -o root -g root \
+        "$tool"/etc/apache2/envvars \
+               /etc/apache2/envvars
+       sudo install -m 660 -o root -g root \
+        "$tool"/etc/apache2/httpd.conf \
+               /etc/apache2/httpd.conf
+       #sudo install -m 660 -o root -g root /dev/stdin \
+       # /etc/apache2/suexec/www-data <<-EOF
+       #       /home
+       #       pub/www/cgi
+       #       EOF
+       sudo install -m 660 -o root -g root \
+        "$tool"/etc/apache2/ports.conf \
+               /etc/apache2/ports.conf
+       sudo a2enmod actions
+       sudo a2enmod headers
+       sudo a2enmod rewrite
+       sudo a2enmod ssl
+       sudo a2enmod userdir
+       local conf
+       sudo a2dissite "*"
+       sudo ln -fns \
+        /etc/apache2 \
+        /home/www/etc/apache2
+       for conf in "$tool"/etc/apache2/site.d/*/VirtualHost.conf
+        do conf=${conf#"$tool"/etc/apache2/site.d/}
+               local port site
+               IFS=. read -r port site <<-EOF
+                       ${conf%\/VirtualHost\.conf}
+                       EOF
+               assert 'test "${site:+set}"'
+               assert 'test "${port:+set}"'
+               local site_user="$user.$port.$site"
+               local site_dir="$user.$port.$site"
+               case $port in
+                (443)
+                       local hint="run vm_remote apache2_key_send before"
+                       assert "sudo test -f /etc/apache2/site.d/\"$site_dir\"/x509/key.pem" hint
+                       sudo install -d -m 770 -o "$user" -g "$user" \
+                        /etc/apache2 \
+                        /etc/apache2/site.d/"$site_dir" \
+                        /etc/apache2/site.d/"$site_dir"/x509 \
+                        /etc/apache2/site.d/"$site_dir"/x509/ca \
+                        /etc/apache2/site.d/"$site_dir"/x509/empty \
+                        /etc/apache2/site.d/"$site_dir"/x509/rvk \
+                        /etc/apache2/site.d/"$site_dir"/x509/usr
+                       sudo install -m 664 -o www -g www \
+                        "$tool"/var/pub/x509/"$site"/crt.self-signed.pem \
+                        /etc/apache2/site.d/"$site_dir"/x509/crt.self-signed.pem
+                       #sudo install -m 664 -o "$user" -g "$user" \
+                       # "$tool"/var/pub/x509/"$site"/rvk.pem \
+                       # /etc/apache2/site.d/"$site_dir"/x509/rvk.pem
+                       sudo install -m 664 -o www -g www \
+                        "$tool"/var/pub/x509/"$site"/ca/crt.self-signed.pem \
+                        /etc/apache2/site.d/"$site_dir"/x509/ca/crt.pem
+                       sudo install -m 664 -o www -g www \
+                        "$tool"/var/pub/x509/"$site"/crt.pem \
+                        /etc/apache2/site.d/"$site_dir"/x509/crt.pem
+                       ;;
+                esac
+               case $port in
+                (80)
+                       cat <<-EOF
+                               <VirtualHost *:$port>
+                                       AssignUserID $site_user $site_user
+                                       CustomLog "|/usr/sbin/rotatelogs /home/www/log/$site_dir/apache2/access/%Y-%m-%d.log 86400 60" Combined
+                                       #CustomLog "/dev/null" Combined
+                                       DocumentRoot /home/www/pub/$site_dir
+                                       ErrorLog "|/usr/sbin/rotatelogs /home/www/log/$site_dir/apache2/error/%Y-%m-%d.log 86400 60"
+                                       #ErrorLog "/dev/null"
+                                       ServerName $site
+                                       LogLevel Warn
+                                       $(cat "$tool"/etc/apache2/site.d/"$site_dir"/VirtualHost.conf)
+                                </VirtualHost>
+                               EOF
+                       ;;
+                (443)
+                       cat <<-EOF
+                               <IfModule mod_ssl.c>
+                                       <VirtualHost *:$port>
+                                               AssignUserID $site_user $site_user
+                                               BrowserMatch "MSIE [2-6]"  ssl-unclean-shutdown nokeepalive downgrade-1.0 force-response-1.0
+                                               BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
+                                               CustomLog "|/usr/sbin/rotatelogs /home/www/log/$site_dir/apache2/access/%Y-%m-%d.log 86400 60" Combined
+                                               #CustomLog "/dev/null" Combined
+                                               DocumentRoot /home/www/pub/$site_dir
+                                               ErrorLog "|/usr/sbin/rotatelogs /home/www/log/$site_dir/apache2/error/%Y-%m-%d.log 86400 60"
+                                               #ErrorLog "/dev/null"
+                                               LogLevel Warn
+                                               ServerName $site
+                                               SSLCACertificateFile    /etc/apache2/site.d/$site_dir/x509/crt.self-signed.pem
+                                               SSLCACertificatePath    /etc/apache2/site.d/$site_dir/x509/usr/
+                                               #SSLCARevocationFile    /etc/apache2/site.d/$site_dir/x509/rvk.pem
+                                               SSLCADNRequestFile      /etc/apache2/site.d/$site_dir/x509/crt.self-signed.pem
+                                               SSLCADNRequestPath      /etc/apache2/site.d/$site_dir/x509/empty/
+                                                       # NOTE: ne publie pas les certificats d’utilisateur-ice-s acceptés
+                                               SSLCARevocationPath     /etc/apache2/site.d/$site_dir/x509/rvk/
+                                               SSLCertificateChainFile /etc/apache2/site.d/$site_dir/x509/ca/crt.pem
+                                               SSLCertificateFile      /etc/apache2/site.d/$site_dir/x509/crt.pem
+                                               SSLCertificateKeyFile   /etc/apache2/site.d/$site_dir/x509/key.pem
+                                               SSLCipherSuite AES+RSA+SHA256
+                                               SSLEngine On
+                                               SSLInsecureRenegotiation Off
+                                               SSLOptions +StrictRequire +OptRenegotiate +StdEnvVars
+                                               SSLProtocol -All +TLSv1
+                                               #SSLRenegBufferSize 262144
+                                               SSLSessionCacheTimeout 1200
+                                               SSLStrictSNIVHostCheck On
+                                               SSLUserName SSL_CLIENT_S_DN_CN
+                                               SSLVerifyClient None
+                                               SSLVerifyDepth 1
+                                               $(cat "$tool"/etc/apache2/site.d/"$site_dir"/VirtualHost.conf)
+                                        </VirtualHost>
+                                </IfModule>
+                               EOF
+                       ;;
+                esac |
+               sudo install -m 660 -o root -g root /dev/stdin \
+                /etc/apache2/site.d/"$site_dir"/VirtualHost.conf
+               sudo ln -fns \
+                ../site.d/"$site_dir"/VirtualHost.conf \
+                /etc/apache2/sites-available/"$site_dir"
+               sudo install -d -m 770 -o "$user" -g "$user" \
+                /home/www/log/"$site_dir" \
+                /home/www/log/"$site_dir"/apache2
+               sudo ln -fns \
+                /etc/apache2/site.d/"$site_dir" \
+                /home/www/etc/apache2/"$site_dir"
+               test -e /home/www/pub/"$site_dir" ||
+               sudo install -d -m 770 -o "$user" -g "$user" \
+                /home/www/pub/"$site_dir"
+               getent passwd "$site_user" >/dev/null ||
+               sudo adduser \
+                --disabled-password \
+                --group \
+                --no-create-home \
+                --home /home/www/pub/"$site_dir" \
+                --shell /bin/false \
+                --system \
+                "$site_user"
+               sudo setfacl -m u:"$site_user":--x \
+                /home/www/ \
+                /home/www/pub/ \
+                /home/www/pub/"$site_dir"/
+               sudo setfacl -m d:u:"$site_user":rwx \
+                "$home"/pub/www/"$site_dir"/
+               test ! -r "$tool"/etc/apache2/site.d/"$site_dir"/configure.sh ||
+               .         "$tool"/etc/apache2/site.d/"$site_dir"/configure.sh
+               test -e /etc/apache2/sites-enabled/"$site_dir" ||
+               sudo a2ensite "$site_dir"
+        done
+       sudo service apache2 restart
+ }
 rule_apt_configure () {
        sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF
                deb http://ftp.fr.debian.org/debian $vm_lsb_name main contrib non-free
@@ -116,9 +291,9 @@ rule_boot_configure () {
 rule_dovecot_configure () {
        rule apt_get_install dovecot-imapd dovecot-managesieved dovecot-sieve
        local hint="run vm_remote dovecot_key_send before"
-       assert "test -f /etc/dovecot/$vm_domainname/imap/x509/key.pem" hint
+       assert "sudo test -f /etc/dovecot/\"$vm_domainname\"/imap/x509/key.pem" hint
        sudo install -m 400 -o root -g root \
-            "$tool"/var/pub/x509/service/imap/crt+crl.self-signed.pem \
+            "$tool"/var/pub/x509/$vm_domainname/imap/crt+crl.self-signed.pem \
         /etc/dovecot/$vm_domainname/imap/x509/crt+crl.self-signed.pem
        sudo install -d -m 770 -o root -g adm \
         /etc/skel/etc/mail \
@@ -297,7 +472,7 @@ rule_time_configure () {
                Europe/Paris
                EOF
        sudo dpkg-reconfigure tzdata
-       # TODO: NTP
+       rule apt_get_install ntp
  }
 rule_locale_configure () {
        sudo install -m 644 -o root -g root /dev/stdin /etc/locale.gen <<-EOF
@@ -449,6 +624,230 @@ rule_network_configure () {
                    pre-down  ip address delete $vm_ipv4/32 dev \$IFACE
                EOF
  }
+rule_www_configure () {
+       getent passwd www >/dev/null ||
+       sudo adduser \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home /home/www \
+        --shell /bin/false \
+        --system \
+        www
+       sudo adduser \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --home ~www/log \
+        --shell /bin/false \
+        --system \
+        log.www
+       #sudo adduser www www-data
+       sudo adduser www log.www
+       #sudo adduser log log.www
+       usermod --home /home/www/pub www-data
+       sudo install -d -m 751 -o www -g www \
+        /home/www
+       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 \
+       sudo install -d -m 1771 -o log.www -g log.www \
+        /home/www/log
+ }
+rule_nginx_configure () {
+       local -; set +f
+       rule apt_get_install nginx
+       rule www_configure
+       sudo rm -rf \
+        /etc/nginx/conf.d \
+        /etc/nginx/site.d
+       sudo install -d -m 770 -o www -g www \
+        /etc/nginx \
+        /etc/nginx/conf.d \
+        /etc/nginx/site.d
+       sudo ln -fns \
+        /etc/nginx \
+        /home/www/etc/nginx
+       sudo install -m 660 -o www -g www \
+        "$tool"/etc/nginx/nginx.conf \
+               /etc/nginx/nginx.conf
+       local conf
+       for conf in "$tool"/etc/nginx/conf.d/*.conf
+        do conf=${conf#"$tool"/etc/nginx/conf.d/}
+               sudo install -m 660 -o www -g www \
+                "$tool"/etc/nginx/conf.d/"$conf" \
+                       /etc/nginx/conf.d/"$conf"
+        done
+       for conf in "$tool"/etc/nginx/site.d/*/server.conf
+        do conf=${conf#"$tool"/etc/nginx/site.d/}
+               local port site
+               IFS=. read -r port site <<-EOF
+                       ${conf%\/server\.conf}
+                       EOF
+               assert 'test "${port:+set}"'
+               assert 'test "${site:+set}"'
+               site="$port.$site"
+               getent passwd www."$site" >/dev/null ||
+               sudo adduser \
+                --disabled-login \
+                --disabled-password \
+                --group \
+                --home ~www-data/"$site" \
+                --shell /bin/false \
+                --system \
+                www."$site"
+               getent passwd log."$site" >/dev/null ||
+               sudo adduser \
+                --disabled-login \
+                --disabled-password \
+                --group \
+                --shell /bin/false \
+                --system \
+                log."$site"
+               sudo usermod --home ~www/log/"$site"/nginx log."$site"
+               sudo install -d -m 770 -o www -g www \
+                /etc/nginx/site.d/"$site"
+               case $port in
+                (443)
+                       local hint="run vm_remote nginx_key_send before"
+                       assert "sudo test -f /etc/nginx/\"$site\"/x509/key.pem" hint
+                       sudo install -m 664 -o www -g www \
+                        "$tool"/var/pub/x509/"$site"/crt+ca.pem \
+                        /etc/nginx/site.d/"$site"/x509/crt.pem
+                       ;;
+                esac
+               case $port in
+                (80)
+                       cat <<-EOF
+                               server {
+                                       listen $port;
+                                       access_log /home/www/log/$site/nginx/access.log main;
+                                       error_log  /home/www/log/$site/nginx/error.log warn;
+                                       root /home/www/pub/$site;
+                                       server_name $site;
+                                       $(cat "$tool"/etc/nginx/site.d/"$site"/server.conf)
+                                }
+                               EOF
+                       ;;
+                (443)
+                       cat <<-EOF
+                               server {
+                                       listen $port;
+                                       access_log /home/www/log/$site/nginx/access.log main;
+                                       error_log  /home/www/log/$site/nginx/error.log warn;
+                                       keepalive_timeout 70;
+                                       root /home/www/pub/$site;
+                                       server_name $site;
+                                       # DOC: http://wiki.nginx.org/HttpSslModule
+                                       ssl on;
+                                       ssl_certificate     /home/www/etc/nginx/site.d/$site/x509/crt.pem;
+                                       ssl_certificate_key /home/www/etc/nginx/site.d/$site/x509/key.pem;
+                                       ssl_ciphers HIGH:!ADH:!MD5;
+                                       ssl_prefer_server_ciphers on;
+                                       ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+                                       ssl_session_cache shared:SSL:10m;
+                                       $(cat "$tool"/etc/nginx/site.d/"$site"/server.conf)
+                                }
+                               EOF
+                       ;;
+                esac |
+               sudo install -m 660 -o www -g www /dev/stdin \
+                /etc/nginx/site.d/"$site"/server.conf
+               adduser www-data "$site"
+               test -e /home/www/pub/"$site" ||
+               sudo install -d -m 3770 -o "$site" -g "$site" \
+                /home/www/pub/"$site"
+               sudo install -d -m 3770 -o log."$site" -g log."$site" \
+                /home/www/log/"$site"/nginx
+               test ! -r "$tool"/etc/nginx/site.d/"$site"/configure.sh ||
+               .         "$tool"/etc/nginx/site.d/"$site"/configure.sh
+        done
+       rule apt_get_install spawn-fcgi fcgiwrap
+       sudo insserv --remove fcgiwrap
+       rule tmpfs_configure
+       sudo service nginx restart
+ }
+rule_php5_fpm_configure () {
+       local -; set +f
+       rule apt_get_install \
+        php5-fpm \
+        php-apc
+       getent passwd php5 >/dev/null ||
+       sudo adduser \
+        --disabled-login \
+        --disabled-password \
+        --group \
+        --shell /bin/false \
+        --system \
+        php5
+       local conf
+       sudo ln -fns \
+        /etc/php5-fpm \
+        /home/www/etc/php5
+       sudo rm -f /etc/php5/fpm/pool.d/*
+       for conf in "$tool"/etc/php5/fpm/pool.d/*.conf
+        do conf=${conf#"$tool"/etc/php5/fpm/pool.d/}
+               local port site
+               IFS=. read -r port site <<-EOF
+                       ${conf%\.conf}
+                       EOF
+               assert 'test "${port:+set}"'
+               assert 'test "${site:+set}"'
+               site="$port.$site"
+               getent passwd php5"$site" >/dev/null ||
+               sudo adduser \
+                --disabled-login \
+                --disabled-password \
+                --group \
+                --no-create-home \
+                --home ~www/pub/"$site" \
+                --shell /bin/false \
+                --system \
+                php5."$site"
+               sudo install -d -m 770 -o php5 -g php5 \
+                /home/www/log/php5 \
+                /home/www/log/php5/fpm
+               sudo install -d -m 770 -o log."$site" -g log."$site" \
+                /home/www/log/"$site"
+               sudo adduser php5."$user" www."$site"
+               sudo install -m 660 -o root -g root /dev/stdin \
+                /etc/php5/fpm/pool.d/"$conf" <<-EOF
+                       [php5.$site]
+                       access.log = /home/www/log/$site/php5/fpm/access.log
+                       catch_workers_output = yes
+                       chdir = /
+                       env[HOSTNAME] = \$HOSTNAME
+                       env[TEMP] = /tmp
+                       env[TMPDIR] = /tmp
+                       env[TMP] = /tmp
+                       group = www-data
+                       listen = /run/nginx/fastcgi/php5.$site
+                       #listen = 127.0.0.1:9000
+                       #listen.allowed_clients = 127.0.0.1
+                       listen.backlog = -1
+                       pm = dynamic
+                       pm.max_children = 5
+                       pm.max_requests = 200
+                       pm.max_spare_servers = 4
+                       pm.min_spare_servers = 2
+                       pm.start_servers = 3
+                       pm.status_path = /status
+                       request_slowlog_timeout = 5s
+                       request_terminate_timeout = 120s
+                       rlimit_core = unlimited
+                       rlimit_files = 131072
+                       slowlog = /home/www/log/$site/php5/fpm/slow.log
+                       user = $php5_user
+                       $(cat "$tool"/etc/php5/fpm/pool.d/"$conf")
+                       EOF
+               sudo install -m 664 -o root -g root \
+                "$tool"/etc/php5/fpm/php.ini \
+                       /etc/php5/fpm/php.ini
+        done
+       rule tmpfs_configure
+       sudo service php5-fpm restart
+ }
 rule_postfix_configure () {
        local hint="run vm_remote postfix_key_send before"
        assert "test -f /etc/postfix/$vm_domainname/smtpd/x509/key.pem" hint
@@ -477,23 +876,29 @@ 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/service/smtpd/crt+crl.self-signed.pem \
+            "$tool"/var/pub/x509/$vm_domainname/smtpd/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/service/smtpd/crt.pem \
+            "$tool"/var/pub/x509/$vm_domainname/smtpd/crt.pem \
         /etc/postfix/$vm_domainname/smtpd/x509/crt.pem
        sudo install -m 400 -o root -g root \
-            "$tool"/var/pub/x509/service/smtpd/crt+root.pem \
-        /etc/postfix/$vm_domainname/smtpd/x509/crt+root.pem
+            "$tool"/var/pub/x509/$vm_domainname/smtpd/crt+ca.pem \
+        /etc/postfix/$vm_domainname/smtpd/x509/crt+ca.pem
        sudo install -m 400 -o root -g root \
-            "$tool"/var/pub/x509/service/smtpd/crt+crl.self-signed.pem \
+            "$tool"/var/pub/x509/$vm_domainname/smtpd/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 \
                /etc/postfix/$vm_domainname/header_checks
-       sudo install -m 664 -o root -g root \
-        "$tool"/etc/postfix/aliases \
-               /etc/postfix/aliases
+       sudo install -m 664 -o root -g root /dev/stdin \
+        /etc/postfix/aliases <<-EOF
+               # See man 5 aliases for format
+               abuse: root
+               admin: root
+               contact: root
+               postmaster: root
+               root: $(getent group sudo | cut -f 4 -d : | tr , ' ')
+               EOF
        sudo newaliases -oA/etc/postfix/aliases
        cat /dev/stdin "$tool"/etc/postfix/main.cf <<-EOF |
                mydomain      = $vm_domainname
@@ -603,19 +1008,39 @@ rule_ssh_configure () {
                EOF
        sudo service ssh restart
  }
-rule_user_admin_add () { # SYNTAX: $user
+rule_user_add () { # SYNTAX: $user
+       rule user_configure
        local user=$1
        id "$user" >/dev/null ||
        sudo adduser --disabled-password "$user"
                # NOTE: le mot-de-passe doit être initialisé par l'utilisateur à l'aide de passwd-init .
        eval local home\; home="~$user"
+       sudo adduser "$user" users
+       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_configure () {
+       true
+ }
+rule_user_admin_add () { # SYNTAX: $user
+       rule user_configure
+       local user=$1
+       id "$user" >/dev/null ||
+       sudo adduser --disabled-password "$user"
+       eval local home\; home="~$user"
        sudo adduser "$user" sudo
+       sudo adduser "$user" users
        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"
+        do sudo -u "$user" gpg --import - <"$key"
         done
        rule user_admin_configure
  }
@@ -626,13 +1051,14 @@ rule_user_admin_configure () {
 rule_user_configure () {
        sudo install -d -m 750 -o root -g adm \
         /etc/skel/etc \
+        /etc/skel/etc/gpg \
         /etc/skel/etc/ssh
        sudo install -d -m 770 -o root -g adm \
-        /etc/skel/etc/apache2 \
         /etc/skel/var \
-        /etc/skel/var/log \
         /etc/skel/var/cache \
-        /etc/skel/var/cache/ssh
+        /etc/skel/var/log \
+        /etc/skel/var/run \
+        /etc/skel/var/run/ssh
        sudo ln -fns etc/ssh /etc/skel/.ssh
        sudo ln -fns etc/gpg /etc/skel/.gnupg
        sudo install -m 640 -o root -g root /dev/stdin /etc/sudoers.d/passwd-init <<-EOF
@@ -668,8 +1094,8 @@ rule_user_configure () {
 rule_user_root_configure () {
        sudo install -d -m 750 -o root -g adm \
         /root/etc \
-        /root/etc/ssh \
-        /root/etc/gpg
+        /root/etc/gpg \
+        /root/etc/ssh
        sudo ln -fns etc/gpg /root/.gnupg
        sudo ln -fns etc/ssh /root/.ssh
        getent group sudo |
@@ -697,10 +1123,13 @@ rule_configure () {
        rule filesystem_configure
        rule login_configure
        rule ssh_configure
-       rule mail_configure
        rule user_root_configure
        rule boot_configure
        rule user_configure
+       rule mail_configure
+       #rule apache2_configure
+       rule nginx_configure
+       rule php5_fpm_configure
  }
 
 rule_luks_key_change () {