Ajout : vm_remote : rule_gpg .

[lhc/ateliers.git] / etc / sv / nsd3 / configure.sh

diff --git a/etc/sv/nsd3/configure.sh b/etc/sv/nsd3/configure.sh
index 0e870e3..43da558 100644 (file)
--- a/etc/sv/nsd3/configure.sh
+++ b/etc/sv/nsd3/configure.sh
@@ -1,7 +1,6 @@
 rule apt_get_install nsd
 rule insserv_remove  nsd3
-sudo rm -rf \
- /etc/nsd3/zone.d
+
 sudo install -d -m 750 -o root -g nsd \
  /etc/nsd3/zone.d
 {
@@ -11,30 +10,33 @@ sudo install -d -m 750 -o root -g nsd \
                        ip4-only: yes
                EOF
        cat "$tool"/etc/nsd3/nsd.conf
-       local conf
-       for conf in "$tool"/etc/nsd3/zone.d/*.conf
-        do conf=${conf#"$tool"/etc/nsd3/zone.d/}
-               local domain=${conf%.conf}
-               if test -e "$tool"/etc/nsd3/zone.d/"$domain".zone.m4
+       for zone in $(find "$tool"/etc/nsd3/zone.d \
+        -mindepth 1 -maxdepth 1 -type f \
+        -false ${@:+$(printf -- '-or -name %s.conf\n' "$@")} \
+        -printf '%f\n')
+        do zone=${zone%.conf}
+               if test -e "$tool"/etc/nsd3/zone.d/"$zone".zone.m4
                 then m4 \
-                        --define=ZONE_DOMAIN=$domain \
-                        --define=ZONE_SERIAL=$(cd "$tool" && git log -1 --format="%ct" -- etc/nsd3/zone.d/"$domain".zone.m4) \
+                        --define=ZONE_DOMAIN=$zone \
+                        --define=ZONE_SERIAL=$(cd "$tool" && git log -1 --format="%ct" -- etc/nsd3/zone.d/"$zone".zone.m4) \
                         --define=VM_IP4=$vm_ipv4 \
-                               "$tool"/etc/nsd3/zone.d/"$domain".zone.m4
-                else cat "$tool"/etc/nsd3/zone.d/"$domain".zone
+                               "$tool"/etc/nsd3/zone.d/"$zone".zone.m4
+                else cat "$tool"/etc/nsd3/zone.d/"$zone".zone
                 fi |
                sudo install -m 440 -o root -g nsd /dev/stdin \
-                /etc/nsd3/zone.d/"$domain".zone
-               sudo install -m 440 -o root -g nsd \
-                "$tool"/etc/nsd3/zone.d/"$conf" \
-                       /etc/nsd3/zone.d/"$conf"
+                /etc/nsd3/zone.d/"$zone".zone
                cat <<-EOF
                        zone:
-                               name: $domain
-                               zonefile: /etc/nsd3/zone.d/$domain.zone
+                               name: $zone
+                               zonefile: /etc/nsd3/zone.d/$zone.zone
+                               $(cat "$tool"/etc/nsd3/zone.d/"$zone".conf)
                        EOF
         done
 } |
 sudo install -m 640 -o root -g nsd /dev/stdin \
  /etc/nsd3/nsd.conf
+
+rule _runit_sv_start "$sv"
 sudo nsdc rebuild
+sudo nsdc reload
+#sudo nsdc notify