dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modification : etc/aliases -> etc/postfix/aliases .
[lhc/ateliers.git]
/
vm_hosted
diff --git
a/vm_hosted
b/vm_hosted
index
87182dc
..
d0dec72
100755
(executable)
--- a/
vm_hosted
+++ b/
vm_hosted
@@
-1,6
+1,10
@@
#!/bin/sh
set -e -f ${DRY_RUN:+-n} -u
#!/bin/sh
set -e -f ${DRY_RUN:+-n} -u
-tool=${0%/*}
+tool=$0
+while test -L "$tool"
+ do tool=$(readlink "$tool")
+ done
+tool=${tool%/*}
. "$tool"/lib/rule.sh
. "$tool"/etc/vm.sh
. "$tool"/lib/rule.sh
. "$tool"/etc/vm.sh
@@
-30,6
+34,7
@@
rule_git_configure () {
local tool
tool=$(cd "$tool"; cd -)
sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
local tool
tool=$(cd "$tool"; cd -)
sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/
+ sudo ln -fns "$tool"/vm_hosted /usr/local/sbin/vm
)
}
rule_git_reset () {
)
}
rule_git_reset () {
@@
-207,13
+212,9
@@
rule_etckeeper_configure () {
LOWLEVEL_PACKAGE_MANAGER=dpkg
EOF
sudo install -m 644 -o root -g root \
LOWLEVEL_PACKAGE_MANAGER=dpkg
EOF
sudo install -m 644 -o root -g root \
- etc/etckeeper/prompt.sh \
- /etc/etckeeper/prompt.sh
- sudo install -m 755 -o root -g root \
- etc/etckeeper/update-ignore.d/02custom-ignore \
- /etc/etckeeper/update-ignore.d/02custom-ignore
+ "$tool"/etc/etckeeper/prompt.sh \
+ /etc/etckeeper/prompt.sh
rule apt_get_install etckeeper
rule apt_get_install etckeeper
- sudo etckeeper update-ignore -a
}
rule_filesystem_configure () {
sudo install -m 644 -o root -g root /dev/stdin /etc/fstab <<-EOF
}
rule_filesystem_configure () {
sudo install -m 644 -o root -g root /dev/stdin /etc/fstab <<-EOF
@@
-421,6
+422,9
@@
rule_postfix_configure () {
assert "test -f /etc/postfix/$vm_domainname/smtpd/x509/key.pem" hint
warn "lors de l'installation Debian, ne sélectionner aucune configuration pour postfix"
rule apt_get_install postfix
assert "test -f /etc/postfix/$vm_domainname/smtpd/x509/key.pem" hint
warn "lors de l'installation Debian, ne sélectionner aucune configuration pour postfix"
rule apt_get_install postfix
+ sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
+ *.db
+ EOF
sudo install -d -m 770 -o root -g root \
/etc/postfix/$vm_domainname/ \
/etc/postfix/$vm_domainname/smtp \
sudo install -d -m 770 -o root -g root \
/etc/postfix/$vm_domainname/ \
/etc/postfix/$vm_domainname/smtp \
@@
-456,9
+460,9
@@
rule_postfix_configure () {
etc/postfix/$vm_domainname/header_checks \
/etc/postfix/$vm_domainname/header_checks
sudo install -m 664 -o root -g root \
etc/postfix/$vm_domainname/header_checks \
/etc/postfix/$vm_domainname/header_checks
sudo install -m 664 -o root -g root \
- etc/aliases \
- /etc/aliases
- sudo newaliases
+ etc/
postfix/
aliases \
+ /etc/
postfix/
aliases
+ sudo newaliases
-oA/etc/postfix/aliases
cat /dev/stdin etc/postfix/main.cf <<-EOF |
mydomain = $vm_domainname
myorigin = \$mydomain
cat /dev/stdin etc/postfix/main.cf <<-EOF |
mydomain = $vm_domainname
myorigin = \$mydomain