X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=vm_hosted;h=ecf17c4068dd4aacc47febcc818ca6de17bd2f76;hp=3259ef132315706d286b4d4f187ffad5bf510621;hb=eefc410c23df14d9e47bfc1eedcfb500d557c5a8;hpb=1b63122dd097c575896b4c4158ed5439eeca1563 diff --git a/vm_hosted b/vm_hosted index 3259ef1..ecf17c4 100755 --- a/vm_hosted +++ b/vm_hosted @@ -8,7 +8,6 @@ tool=${tool%/*} . "$tool"/lib/rule.sh . "$tool"/etc/vm.sh export TRACE=1 -cd / rule_help () { # SYNTAX: [--hidden] local hidden; [ ${1:+set} ] || hidden=set @@ -61,10 +60,16 @@ rule_adduser () { sudo adduser "$@" "$user" } rule_apt_get_install () { # SYNTAX: $package - sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes "$@" + sudo \ + DEBIAN_FRONTEND=noninteractive \ + DEBIAN_PRIORITY=low \ + apt-get install --yes "$@" } rule_dpkg_reconfigure () { # SYNTAX: $package - sudo DEBIAN_FRONTEND=noninteractive dpkg-reconfigure "$@" + sudo \ + DEBIAN_FRONTEND=noninteractive \ + DEBIAN_PRIORITY=low \ + dpkg-reconfigure "$@" } rule__chrooted_configure () { # NOTE: est-ce bien utile à un moment ? @@ -243,13 +248,16 @@ rule_apache2_configure () { # XXX: cette règle n'est pas testée/mise-à-jour sudo service apache2 restart } rule_apt_configure () { - sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF + sudo install -m 664 -o root -g root /dev/stdin /etc/apt/sources.list <<-EOF deb http://ftp.rezopole.net/debian $vm_lsb_name main EOF - sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/$vm_lsb_name-backports.list <<-EOF + sudo install -m 664 -o root -g root /dev/stdin /etc/apt/sources.list.d/$vm_lsb_name-backports.list <<-EOF deb http://ftp.rezopole.net/debian $vm_lsb_name-backports main EOF - sudo install -m 660 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF + sudo install -m 664 -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 -m 664 -o root -g root /dev/stdin /etc/apt/preferences <<-EOF Package: * Pin: release a=$vm_lsb_name Pin-Priority: 200 @@ -297,35 +305,6 @@ rule_boot_configure () { # et davantage sécurisant. EOF } -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 \ - "$tool"/var/pub/x509/imap."$vm_domainname"/crt+crl.self-signed.pem \ - /etc/dovecot/"$vm_domainname"/imap/x509/crt+crl.self-signed.pem - sudo install -d -m 770 -o root -g root \ - /etc/skel/etc/mail \ - /etc/skel/etc/sieve - sudo install -d -m 1777 -o root -g root \ - /var/lib/dovecot-control \ - /var/lib/dovecot-index - m4 \ - --define=VM_DOMAINNAME=$vm_domainname \ - <"$tool"/etc/dovecot/local.conf.m4 | - sudo install -m 644 -o root -g root /dev/stdin \ - /etc/dovecot/local.conf - sudo install -m 755 -o root -g root /dev/stdin /usr/local/bin/dovecot-passwd <<-EOF - #!/bin/sh -efux - # DESCRIPTION: permet à un-e utilisateurice d'initialiser ellui-même son mot-de-passe dovecot. - install -d -m 770 ~/etc/dovecot - install -m 640 /dev/stdin ~/etc/dovecot/passwd <<_EOF - \$USER:\$(/usr/bin/doveadm pw -s SHA512-CRYPT)::::::: - _EOF - EOF - rule runit_configure dovecot - } rule_etckeeper_configure () { sudo install -m 644 -o root -g root /dev/stdin /etc/etckeeper/etckeeper.conf <<-EOF VCS=git @@ -559,92 +538,6 @@ rule_login_configure () { xvc0 EOF } -rule_mail_configure () { - rule postfix_configure - rule postgrey_configure - rule procmail_configure - rule dovecot_configure - } -rule_mysql_configure () { - rule apt_get_install mysql-server-5.5 - rule insserv_remove mysql - rule adduser mysql \ - --disabled-login \ - --disabled-password \ - --group \ - --home /home/mysql \ - --shell /bin/false \ - --system - rule adduser mysql-data \ - --disabled-login \ - --disabled-password \ - --group \ - --home /home/mysql/data \ - --no-create-home \ - --shell /bin/false \ - --system - sudo usermod --home /home/mysql mysql - sudo adduser mysql mysql-data - 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 \ - /home/mysql/data - sudo -u mysql mysql_install_db \ - --datadir=/home/mysql/data \ - --no-defaults - fi - rule runit_configure mysql - while ! sudo -u mysql mysql -u mysql