. "$tool"/lib/rule.sh
. "$tool"/etc/vm.sh
export TRACE=1
+cd /
rule_help () { # SYNTAX: [--hidden]
local hidden; [ ${1:+set} ] || hidden=set
}
rule_dovecot_configure () {
rule apt_get_install dovecot-imapd dovecot-managesieved dovecot-sieve
+ rule insserv_remove dovecot
local hint="run vm_remote dovecot_key_send before"
assert "sudo test -f /etc/dovecot/\"$vm_domainname\"/imap/x509/key.pem" hint
sudo install -m 400 -o root -g root \
EOF
sudo install -m 664 -o root -g root /dev/stdin /etc/postgrey/whitelist_recipients.local <<-EOF
EOF
- sudo service dovecot restart
+ rule runit_sv_configure dovecot
+ rule runit_sv_restart dovecot
}
rule_etckeeper_configure () {
sudo install -m 644 -o root -g root /dev/stdin /etc/etckeeper/etckeeper.conf <<-EOF
# NOTE: clefs générées par Debian
sudo update-initramfs -u
}
+rule_insserv_remove () { # SYNTAX: $sv
+ local sv="$1"
+ sudo chmod u+x /etc/init.d/"$sv"
+ sudo insserv --force --remove "$sv"
+ sudo /etc/init.d/"$sv" stop
+ sudo chmod ugo-x /etc/init.d/"$sv"
+ }
rule_gitolite_configure () {
sudo debconf-set-selections <<-EOF
gitolite gitolite/gituser string git
--shell /bin/false \
--system
sudo adduser git git-data
- sudo install -d -m 770 -o git -g git \
+ sudo install -d -m 750 -o git -g git \
/etc/gitolite \
/home/git/etc \
/home/git/etc/ssh
do test ! -d /home/git/etc/gitolite/"$d" ||
rmdir /home/git/etc/gitolite/"$d"
done
- sudo service tmpfs restart
+ rule tmpfs_configure
}
rule_locales_configure () {
sudo debconf-set-selections <<-EOF
}
rule_mysql_configure () {
rule apt_get_install mysql-server-5.5
+ rule insserv_remove mysql
rule adduser mysql \
--disabled-login \
--disabled-password \
--system
sudo usermod --home /home/mysql mysql
sudo adduser mysql mysql-data
- sudo install -m 644 -o mysql -g mysql \
- "$tool"/etc/mysql/my.cnf \
- /etc/mysql/my.cnf
sudo install -d -m 751 -o mysql -g mysql \
/home/mysql
sudo rm -rf /etc/mysql
sudo install -d -m 750 -o mysql -g mysql \
/etc/mysql \
+ /etc/mysql/conf.d \
/home/mysql/etc
sudo ln -fns \
/etc/mysql \
/home/mysql/etc/mysql
+ sudo install -m 644 -o mysql -g mysql \
+ "$tool"/etc/mysql/my.cnf \
+ /etc/mysql/my.cnf
if sudo test ! -d /home/mysql/data
then
sudo install -d -m 750 -o mysql -g mysql-data \
--datadir=/home/mysql/data \
--no-defaults
fi
- sudo service tmpfs restart
- sudo insserv -r mysql
- sudo chmod ugo-x /etc/init.d/mysql
- case $(sudo sv status mysql || true) in
- (''|run:*|*"s, normally up;"*)
- sudo sv restart mysql
- case $(sudo inotifywait -e create -- /run/mysqld/sock/) in
- ("/run/mysqld/sock/ CREATE mysql")
- # NOTE:
- # - ajoute l'accès par socket Unix à mysql
- # - ajoute les droits de super-utilisateur à mysql
- # - supprime l'accès par mot-de-passe à root
- # - supprime les bases de données de l'utilisateurice anonyme
- # - supprime l'utilisateurice anonyme
- # NOTE: mémo :
- # GRANT USAGE ON *.* TO 'root'@'*' IDENTIFIED WITH auth_socket;
- # CREATE USER 'root'@'localhost' IDENTIFIED WITH auth_socket;
- # UPDATE mysql.user SET Password='' WHERE user='root';
- # DELETE FROM mysql.user WHERE user = 'root' AND host NOT IN ('localhost', '127.0.0.1', '::1');
- sudo mysql -u root --batch --verbose <<-EOF
- DELETE FROM mysql.user WHERE user = 'root' and plugin = '';
- GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' IDENTIFIED WITH auth_socket;
- UPDATE mysql.user SET grant_priv='Y',super_priv='Y' WHERE user='mysql';
- DELETE FROM mysql.db WHERE user = '';
- DELETE FROM mysql.user WHERE user = '';
- FLUSH PRIVILEGES;
- EOF
- ;;
- esac
- esac
+ rule tmpfs_configure
+ rule runit_sv_configure mysql
+ rule runit_sv_restart mysql
+ while ! sudo -u mysql mysql -u mysql </dev/null
+ do sleep 0.3; done
+ # NOTE:
+ # - ajoute l'accès par socket Unix à mysql
+ # - ajoute les droits de super-utilisateur à mysql
+ # - supprime l'accès par mot-de-passe à root
+ # - supprime les bases de données de l'utilisateurice anonyme
+ # - supprime l'utilisateurice anonyme
+ # NOTE: mémo :
+ # GRANT USAGE ON *.* TO 'root'@'*' IDENTIFIED WITH auth_socket;
+ # CREATE USER 'root'@'localhost' IDENTIFIED WITH auth_socket;
+ # UPDATE mysql.user SET Password='' WHERE user='root';
+ # DELETE FROM mysql.user WHERE user = 'root' AND host NOT IN ('localhost', '127.0.0.1', '::1');
+ sudo mysql -u root --batch --verbose <<-EOF
+ DELETE FROM mysql.user WHERE user = 'root' and plugin = '';
+ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' IDENTIFIED WITH auth_socket;
+ UPDATE mysql.user SET grant_priv='Y',super_priv='Y' WHERE user='mysql';
+ DELETE FROM mysql.db WHERE user = '';
+ DELETE FROM mysql.user WHERE user = '';
+ FLUSH PRIVILEGES;
+ EOF
}
rule_mysql_db_add () { # SYNTAX: $user $db
sudo -u mysql mysql --batch <<-EOF
}
rule_nginx_configure () {
local -; set +f
- rule apt_get_install nginx
+ rule php5_fpm_configure
+ rule apt_get_install nginx spawn-fcgi fcgiwrap
+ rule insserv_remove nginx
+ rule insserv_remove fcgiwrap
sudo rm -rf \
/etc/nginx/conf.d \
/etc/nginx/site.d
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
- sudo chmod ugo-x /etc/init.d/fcgiwrap
- #sudo insserv --remove nginx
- #sudo chmod ugo-x /etc/init.d/nginx
rule tmpfs_configure
- sudo service php5-fpm restart
- # NOTE: relance les processus du pool
- # pour leur donner les droits
- # de leurs groupes supplémentaires.
- sudo service nginx restart
+ rule runit_sv_configure nginx
+ rule runit_sv_restart nginx
}
rule_nsd3_configure () { # NOTE: DNS autoritaire uniquement
local -; set +f
rule apt_get_install nsd m4
+ rule insserv_remove nsd3
sudo rm -rf \
/etc/nsd3/zone.d
sudo install -d -m 750 -o root -g nsd \
} |
sudo install -m 640 -o root -g nsd /dev/stdin \
/etc/nsd3/nsd.conf
- sudo service nsd3 restart
+ sudo nsdc rebuild
+ rule runit_sv_configure nsd3
+ rule runit_sv_restart nsd3
+ }
+rule_ntp_configure () {
+ # NOTE: http://my.opera.com/marcomarongiu/blog/2011/01/05/independent-wallclock-in-xen-4
+ rule apt_get_install ntp
+ rule insserv_remove ntp
+ rule runit_sv_configure ntp
+ rule runit_sv_restart ntp
+ }
+rule_openerp_configure () {
+ sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
+ deb http://nightly.openerp.com/7.0/nightly/deb/ ./
+ EOF
+ sudo install -d -m 1777 -o root -g root \
+ /etc/openerp
+ rule apt_get_install openerp --force-yes
+ # XXX: --force-yes car les paquets de nightly.openerp.com
+ # ne sont pas signés par OpenPGP..
+ rule insserv_remove openerp
}
rule_php5_fpm_configure () {
local -; set +f
- rule apt_get_install \
- php5-fpm \
- php-apc
+ rule apt_get_install php5-fpm php-apc
+ rule insserv_remove php5-fpm
rule adduser php5 \
--disabled-login \
--disabled-password \
sudo install -d -m 770 -o php5 -g php5 \
/etc/php5/fpm/conf.d \
/etc/php5/fpm/pool.d
- sudo install -m 770 -o php5 -g php5 \
+ sudo install -m 440 -o php5 -g php5 \
"$tool"/etc/php5/fpm/php-fpm.conf \
/etc/php5/fpm/php-fpm.conf
local conf
sudo install -m 664 -o php5 -g php5 \
"$tool"/etc/php5/fpm/php.ini \
/etc/php5/fpm/php.ini
- case $(sudo sv status php5-"$pool") in
- (run:*) sudo sv restart php5-"$pool"
- esac
done
rule tmpfs_configure
- sudo service php5-fpm restart
+ rule runit_sv_configure php5-fpm
+ rule runit_sv_restart php5-fpm
}
rule_postfix_configure () {
local hint="run vm_remote postfix_key_send before"
postfix postfix/main_mailer_type select No configuration
EOF
rule apt_get_install postfix
+ rule insserv_remove postfix
sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
*.db
EOF
sudo install -m 400 -o root -g root \
"$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 \
+ sudo install -m 640 -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 /dev/stdin \
+ sudo install -m 644 -o root -g root /dev/stdin \
/etc/postfix/aliases <<-EOF
# See man 5 aliases for format
abuse: root
mail_name = \$myhostname
mydestination = $vm_hostname \$myhostname \$myorigin
EOF
- sudo install -m 664 -o root -g root /dev/stdin \
+ sudo install -m 640 -o root -g root /dev/stdin \
/etc/postfix/main.cf
- sudo install -m 664 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/master.cf \
/etc/postfix/master.cf
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/smtp/x509/policy \
/etc/postfix/$vm_domainname/smtp/x509/policy
sudo postmap hash:/etc/postfix/$vm_domainname/smtp/x509/policy
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/smtp/header_checks \
/etc/postfix/$vm_domainname/smtp/header_checks
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/smtpd/sender_access \
/etc/postfix/$vm_domainname/smtpd/sender_access
sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/sender_access
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/smtpd/client_blacklist \
/etc/postfix/$vm_domainname/smtpd/client_blacklist
sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/client_blacklist
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/smtpd/relay_clientcerts \
/etc/postfix/$vm_domainname/smtpd/relay_clientcerts
sudo postmap hash:/etc/postfix/$vm_domainname/smtpd/relay_clientcerts
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/transport \
/etc/postfix/$vm_domainname/transport
sudo postmap hash:/etc/postfix/$vm_domainname/transport
- sudo install -m 660 -o root -g root \
+ sudo install -m 640 -o root -g root \
"$tool"/etc/postfix/$vm_domainname/virtual_alias \
/etc/postfix/$vm_domainname/virtual_alias
sudo postmap hash:/etc/postfix/$vm_domainname/virtual_alias
- sudo service postfix restart
+ rule runit_sv_configure postfix
+ rule runit_sv_restart postfix
}
rule_postgresql_configure () {
# DOC: http://wiki.postgresql.org/wiki/Shared_Database_Hosting
rule apt_get_install postgresql-9.1
+ rule insserv_remove postgresql
rule adduser postgres \
--disabled-login \
--disabled-password \
sudo adduser postgres postgres-data
sudo rm -rf \
/etc/postgresql
- sudo install -d -m 750 -o postgres -g postgres \
+ sudo install -d -m 1751 -o postgres -g postgres-data \
/home/postgresql \
/home/postgresql/etc \
/etc/postgresql \
sudo ln -fns \
/etc/postgresql \
/home/postgresql/etc/postgresql
- sudo install -d -m 751 -o postgres -g postgres \
+ sudo install -d -m 2770 -o postgres -g log-postgres \
/home/postgresql/log \
- /home/postgresql/log/9.1
- sudo service tmpfs restart
+ /home/postgresql/log/9.1 \
+ /home/postgresql/log/9.1/main
+ rule tmpfs_configure
if sudo test ! -d /home/postgresql/data
then
sudo install -d -m 750 -o postgres -g postgres \
/home/postgresql/data
- (
- cd /
sudo -u postgres pg_createcluster \
--datadir=/home/postgresql/data \
- --logfile=/home/postgresql/log/9.1/main \
- --socketdir=/run/postgresql/sock \
- --start 9.1 main
- )
+ --logfile=/home/postgresql/log/9.1/main/cluster.log \
+ --socketdir=/run/postgresql \
+ 9.1 main
fi
sudo install -m 770 -o postgres -g postgres /dev/stdin \
/etc/postgresql/9.1/main/pg_hba.conf <<-EOF
local all postgres peer
local all all peer
EOF
- sudo install -m 660 -o postgres -g postgres \
+ sudo install -m 640 -o postgres -g postgres-data \
"$tool"/etc/postgresql/9.1/main/postgresql.conf \
/etc/postgresql/9.1/main/postgresql.conf
- sudo insserv -r postgresql
- sudo chmod ugo-x /etc/init.d/postgresql
- case $(sudo sv status postgres || true) in
- (''|run:*|*"s, normally up;"*)
- sudo sv restart postgres
- (
- cd /
- case $(sudo inotifywait -e create -- /run/postgresql/sock/) in
- ("/run/postgresql/sock/ CREATE .s.PGSQL."*)
- # NOTE:
- # - supprime l'accès au schéma public depuis public,
- # de sorte à ce que les différents utilisateurices
- # ne voient pas leurs bases de données entre-elleux ;
- # - ajoute le support de PL/PGSQL.
- sudo -u postgres psql template1 -f - <<-EOF
- REVOKE ALL ON DATABASE template1 FROM public;
- REVOKE ALL ON SCHEMA public FROM public;
- GRANT ALL ON SCHEMA public TO postgres;
+ rule runit_sv_configure postgres
+ rule runit_sv_restart postgres
+ while ! sudo -u postgres psql </dev/null
+ do sleep 0.3; done
+ # NOTE: supprime l'accès au schéma public depuis public,
+ # de sorte à ce que les différents utilisateurices
+ # ne voient pas leurs bases de données entre-elleux ;
+ sudo -u postgres psql template1 -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ REVOKE ALL ON DATABASE template1 FROM public;
+ REVOKE ALL ON SCHEMA public FROM public;
+ GRANT ALL ON SCHEMA public TO postgres;
+ EOF
+ # NOTE: ajoute le support de PL/PGSQL s'il ne l'est pas déjà.
+ sudo -u postgres psql template1 -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ CREATE OR REPLACE FUNCTION create_language_plpgsql()
+ RETURNS BOOLEAN AS \$\$
CREATE LANGUAGE plpgsql;
- EOF
- # NOTE:
- # - supprime l'accès à la liste des bases données
- # et utilisateurices depuis public.
- sudo -u postgres psql template1 -f - <<-EOF
- REVOKE ALL ON pg_auth_members FROM public;
- REVOKE ALL ON pg_authid FROM public;
- REVOKE ALL ON pg_database FROM public;
- REVOKE ALL ON pg_group FROM public;
- REVOKE ALL ON pg_roles FROM public;
- REVOKE ALL ON pg_settings FROM public;
- REVOKE ALL ON pg_tablespace FROM public;
- REVOKE ALL ON pg_user FROM public;
- EOF
- ;;
- esac
- )
+ SELECT TRUE;
+ \$\$ LANGUAGE SQL;
+ SELECT CASE WHEN NOT (
+ SELECT TRUE AS exists
+ FROM pg_language
+ WHERE lanname = 'plpgsql'
+ UNION
+ SELECT FALSE AS exists
+ ORDER BY exists DESC
+ LIMIT 1
+ )
+ THEN
+ create_language_plpgsql()
+ ELSE
+ FALSE
+ END AS plpgsql_created;
+ DROP FUNCTION create_language_plpgsql();
+ EOF
+ # NOTE: supprime l'accès à la liste des bases données
+ # et utilisateurices depuis public.
+ sudo -u postgres psql template1 -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ REVOKE ALL ON pg_auth_members FROM public;
+ REVOKE ALL ON pg_authid FROM public;
+ REVOKE ALL ON pg_database FROM public;
+ REVOKE ALL ON pg_group FROM public;
+ REVOKE ALL ON pg_roles FROM public;
+ REVOKE ALL ON pg_settings FROM public;
+ REVOKE ALL ON pg_tablespace FROM public;
+ REVOKE ALL ON pg_user FROM public;
+ EOF
+ }
+rule_postgresql_db_add () { # SYNTAX: $db $owner
+ local db="$1"
+ local owner="${2:-$db}"
+ sudo -u postgres psql template1 -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ DO LANGUAGE plpgsql \$\$
+ BEGIN
+ IF NOT EXISTS (
+ SELECT *
+ FROM pg_catalog.pg_user
+ WHERE usename = '$owner'
+ LIMIT 1
+ ) THEN
+ CREATE ROLE $owner
+ LOGIN
+ NOCREATEDB
+ NOCREATEROLE
+ NOINHERIT
+ NOSUPERUSER;
+ END IF;
+ END;
+ \$\$;
+ EOF
+ case $(sudo -u postgres psql template1 -t -c \
+ "SELECT datname FROM pg_catalog.pg_database WHERE datname = '$db' LIMIT 1") in
+ (" $db") true;;
+ (*)
+ sudo -u postgres psql template1 -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ CREATE DATABASE $db WITH OWNER=$owner;
+ EOF
;;
esac
- }
-rule_postgresql_db_add () { # SYNTAX: $db $db_user
- local db="$1" db_user="$2"
- sudo -u postgresql psql template1 -f - <<-EOF
- CREATE ROLE $db NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT NOLOGIN;
- CREATE ROLE $db_user NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED;
- GRANT $db TO $db_user;
- CREATE DATABASE $db WITH OWNER=$db_user;
+ sudo -u postgres psql template1 -a -f - <<-EOF
+ \set ON_ERROR_STOP on
REVOKE ALL ON DATABASE $db FROM public;
EOF
+ sudo -u postgres psql "$db" -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ GRANT ALL ON SCHEMA public TO $owner WITH GRANT OPTION;
+ EOF
}
rule_postgresql_db_user_add () { # SYNTAX: $db $user
local db="$1" user="$2"
- sudo -u postgresql psql template1 -f - <<-EOF
- CREATE ROLE $user NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED;
+ sudo -u postgres psql "$db" -a -f - <<-EOF
+ \set ON_ERROR_STOP on
+ DO LANGUAGE plpgsql \$\$
+ BEGIN
+ IF NOT EXISTS (
+ SELECT *
+ FROM pg_catalog.pg_user
+ WHERE usename = '$user'
+ LIMIT 1
+ ) THEN
+ CREATE ROLE $user
+ LOGIN
+ NOCREATEDB
+ NOCREATEROLE
+ NOINHERIT
+ NOSUPERUSER;
+ END IF;
+ END;
+ \$\$;
GRANT USAGE ON SCHEMA public TO $user;
GRANT CONNECT,TEMPORARY ON DATABASE $db TO $user;
- GRANT $db TO $user;
- EOF
- }
-rule_openerp_configure () {
- sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
- deb http://nightly.openerp.com/trunk/nightly/deb/ ./
EOF
- sudo apt-get update
- rule apt_get_install openerp
}
rule_postgrey_configure () {
- rule apt_get_install postgrey
- sudo service postgrey restart
+ rule apt_get_install postgrey
+ rule insserv_remove postgrey
+ rule tmpfs_configure
+ rule runit_sv_configure postgrey
+ rule runit_sv_restart postgrey
}
rule_procmail_configure () {
rule apt_get_install procmail
local -; set +f
for sv in ${1-/etc/service/*}
# NOTE: stoppe les services en retenant leur status de départ
- do sv=$(basename "$sv")
+ do sv=${sv##*/}
local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
local sv_status
IFS= read -r sv_status_$sv_hash <<-EOF
- $(sudo sv status "$sv")
+ $(sudo sv status "$sv" || true)
EOF
sudo rm -f /etc/service/"$sv"
done
- for sv in ${1-"$tool"/etc/sv/*}
+ set -$- ${1-"$tool"/etc/sv/*}
+ while test -n "$*"
# NOTE: configure et (re-)démarre les services
- do sv=$(basename "$sv")
- local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
+ do local first=yes
+ for sv in "$@"
+ do sv=${sv##*/}
+ case $first in
+ (yes) shift $#; first=;;
+ esac
+ local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
+ rule runit_sv_configure "$sv"
+ eval local sv_status=\"\${sv_status_$sv_hash-}\"
+ case $sv_status in
+ ("") true;;
+ (run:*|fail:*) rule runit_sv_restart "$sv";;
+ esac
+ done
+ done
+ }
+rule_runit_sv_configure () { # SYNTAX: $sv
+ local sv="$1"
+ sudo install -d -m 770 -o root -g root \
+ /etc/sv/"$sv"
+ sudo install -m 770 -o root -g root \
+ "$tool"/etc/sv/"$sv"/run \
+ /etc/sv/"$sv"/run
+ if test -e "$tool"/etc/sv/"$sv"/log/run
+ then
sudo install -d -m 770 -o root -g root \
- /etc/sv/"$sv"
+ /etc/sv/"$sv"/log
sudo install -m 770 -o root -g root \
- "$tool"/etc/sv/"$sv"/run \
- /etc/sv/"$sv"/run
- if test -e "$tool"/etc/sv/"$sv"/log/run
- then
- sudo install -d -m 770 -o root -g root \
- /etc/sv/"$sv"/log
- sudo install -m 770 -o root -g root \
- "$tool"/etc/sv/"$sv"/log/run \
- /etc/sv/"$sv"/log/run
- fi
- test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
- . "$tool"/etc/sv/"$sv"/configure.sh
- sudo ln -fns ../sv/"$sv" /etc/service/"$sv"
- eval local sv_status=\"\${sv_status_$sv_hash-}\"
- case $sv_status in
- ("") true;;
- (run:*) sudo sv restart "$sv";;
+ "$tool"/etc/sv/"$sv"/log/run \
+ /etc/sv/"$sv"/log/run
+ fi
+ local continue=
+ test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
+ . "$tool"/etc/sv/"$sv"/configure.sh
+ case $continue in
+ (yes) continue;;
+ esac
+ sudo ln -fns \
+ ../sv/"$sv" \
+ /etc/service/"$sv"
+ }
+rule_runit_sv_restart () { # SYNTAX: $sv
+ local sv="$1"
+ rule runit_sv_configure "$sv"
+ while true
+ do case $(sudo sv restart "$sv") in
+ ("fail: $sv: runsv not running") sleep 1;;
+ ("warning: $sv: unable to open supervise/ok: file does not exists") sleep 1;;
+ (*) break;;
esac
done
}
rule_ssh_configure () {
+ rule apt_get_install openssh-server
+ rule insserv_remove ssh
ssh-keygen -F "$vm_fqdn" -f "$tool"/etc/openssh/known_hosts |
( while IFS= read -r line
do case $line in (*" RSA") return 0; break;; esac
StrictHostKeyChecking ask
UserKnownHostsFile ~/etc/ssh/known_hosts
EOF
- sudo service ssh restart
+ rule runit_sv_configure sshd
+ rule runit_sv_restart sshd
}
rule_sysctl_configure () {
local -; set +f
tzdata tzdata/Zones/Europe select Paris
EOF
rule dpkg_reconfigure tzdata
- rule apt_get_install ntp
+ rule ntp_configure
}
rule_unbound_configure () {
sudo apt-get install unbound m4
+ rule insserv_remove unbound
sudo install -m 644 -o root -g root /dev/stdin /etc/resolv.conf <<-EOF
search ${vm_host#*.}
nameserver 127.0.0.1
<"$tool"/etc/unbound/unbound.conf |
sudo install -m 440 -o unbound -g unbound /dev/stdin \
/etc/unbound/unbound.conf
- sudo service unbound restart
+ rule runit_sv_configure nsd3
+ rule runit_sv_restart nsd3
}
rule_user_add () { # SYNTAX: $user
- rule user_configure
- local user=$1
- rule adduser "$user" --disabled-password
+ local user="$1"; shift
+ rule adduser "$user" --disabled-password "$@"
# 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 \
+ sudo install -m 640 -o "$user" -g "$user" \
"$tool"/var/pub/ssh/"$user".key \
"$home"/etc/ssh/authorized_keys
local key; local -; set +f
LAST_UID=29999
LETTERHOMES=no
NAME_REGEX="^[a-z][-a-z0-9_]*\$"
- QUOTAUSER="" # TODO: init
+ QUOTAUSER=""
+ # TODO: configure a template user (with edquota or setquota)
+ # and indicate their user name in the QUOTAUSER variable.
SETGID_HOME=no
SKEL=/etc/skel
SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)"
sudo install -m 644 -o root -g root \
"$tool"/etc/screenrc \
/etc/screenrc
+ local sh; local -; set +f
+ for sh in "$tool"/etc/user.d/*/configure.sh
+ do sh=${sh#"$tool"/etc/user.d/}
+ local user="${sh%/configure.sh}"
+ . "$tool"/etc/user.d/"$sh"
+ done
}
rule_user_admin_add () { # SYNTAX: $user
rule user_configure
dépôts / lhc / ateliers.git / blobdiff