Suppression : vm_hosted : rule_xinetd_configure .

[lhc/ateliers.git] / vm_hosted

diff --git a/vm_hosted b/vm_hosted
index f63df93..8ffc922 100755 (executable)
--- a/vm_hosted
+++ b/vm_hosted
@@ -1085,6 +1085,10 @@ rule_postfix_configure () {
        sudo postmap hash:/etc/postfix/$vm_domainname/virtual_alias
        sudo service postfix restart
  }
+rule_postgresql_configure () {
+       rule apt_get_install postgresql-9.1
+       sudo service postgresql restart
+ }
 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/ ./
@@ -1221,11 +1225,12 @@ rule_user_admin_configure () {
        rule user_root_configure
  }
 rule_user_configure () {
-       sudo install -d -m 750 -o root -g adm \
+       sudo install -d -m 750 -o root -g root \
+        /etc/skel \
         /etc/skel/etc \
         /etc/skel/etc/gpg \
         /etc/skel/etc/ssh
-       sudo install -d -m 770 -o root -g adm \
+       sudo install -d -m 770 -o root -g root \
         /etc/skel/var \
         /etc/skel/var/cache \
         /etc/skel/var/log \
@@ -1264,7 +1269,7 @@ rule_user_configure () {
                /etc/screenrc
  }
 rule_user_root_configure () {
-       sudo install -d -m 750 -o root -g adm \
+       sudo install -d -m 750 -o root -g root \
         /root/etc \
         /root/etc/gpg \
         /root/etc/ssh
@@ -1285,17 +1290,6 @@ rule_user_root_configure () {
         do sudo gpg --import "$key"
         done
  }
-rule_xinetd_configure () {
-       rule apt_get_install xinetd
-       local -; set +f
-       for conf in "$tool"/etc/xinetd.d/*
-        do conf=${conf#"$tool"/etc/xinetd.d/}
-               sudo install -m 660 -o root -g root \
-                "$tool"/etc/xinetd.d/"$conf" \
-                       /etc/xinetd.d/"$conf"
-        done
-       sudo service xinetd restart
- }
 rule_configure () {
        rule apt_configure
        rule git_configure
@@ -1315,7 +1309,6 @@ rule_configure () {
        rule nginx_configure
        rule php5_fpm_configure
        rule gitolite_configure
-       rule xinetd_configure
  }
 
 rule_luks_key_change () {