Modifications: local/boot-configure

[lhc/ateliers.git] / local / network-configure

diff --git a/local/network-configure b/local/network-configure
index d70b6ff..e349a7b 100755 (executable)
--- a/local/network-configure
+++ b/local/network-configure
@@ -6,19 +6,25 @@ sudo install -m 644 -o root -g root /dev/stdin \
  /etc/hostname <<-EOF
        $vm
        EOF
-grep -q " $vm\$" /etc/hosts ||
+ {
+       printf '%s\n' "$(cat /etc/hosts)"
+       grep -q " $vm\$" /etc/hosts ||
+       printf "%s\n" "127.0.0.1 $local_fqdn $vm"
+       grep -q " postgresql.$local_domainname\$" /etc/hosts ||
+       printf "%s\n" "127.0.0.1 postgresql.$local_domainname"
+ } |
 sudo install -m 644 -o root -g root /dev/stdin \
- /etc/hosts <<-EOF
-       $(cat /etc/hosts)
-       127.0.0.1 $vm_fqdn $vm
-       EOF
+ /etc/hosts
 sudo install -m 644 -o root -g root /dev/stdin \
  /etc/resolv.conf <<-EOF
-       search ${vm_host#*.}
-       nameserver ${vm_host_nameserver}
+       search ${local_host#*.}
+       nameserver 127.0.0.1
+       #nameserver ${local_host_nameserver}
        EOF
 m4 \
- --define=VM_IPV4=$vm_ipv4 \
+ --define=LOCAL_IPV4=$local_ipv4 \
+ --define=LOCAL_GATEWAY=$local_gateway \
+ --define=LOCAL_NETMASK=$local_netmask \
  <"$tool"/etc/network/interfaces.m4 |
 sudo install -m 640 -o root -g root /dev/stdin \
  /etc/network/interfaces