merged. test missing arguments in ddns-client.

Pascal J. Bourguignon [2014-03-02 17:52]
merged. test missing arguments in ddns-client.
Filename
.gitignore
bind/voyager-named.conf.local
ddns/Makefile
ddns/README
ddns/client.lisp
zones-voyager/Makefile
zones-voyager/dyn.informatimago.com.zone
zones-voyager/informatimago.com.zone
zones-voyager/intergruas.com.zone
zones-voyager/ogamita.com.zone
zones-voyager/ogamita.org.zone
zones-voyager/parroquias-manga.org.zone
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/bind/voyager-named.conf.local b/bind/voyager-named.conf.local
new file mode 100644
index 0000000..8a47cce
--- /dev/null
+++ b/bind/voyager-named.conf.local
@@ -0,0 +1,118 @@
+//
+// Add local zone definitions here.
+
+
+// xfr01.domaincontrol.com (97.74.107.15)
+// xfr02.domaincontrol.com (97.74.107.16)
+
+
+zone "informatimago.com." {
+  file "/etc/bind/zones/informatimago.com.zone";
+  type master;
+  notify yes;
+  also-notify {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+  allow-transfer {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+};
+
+
+key dyn.informatimago.com. {
+  algorithm "HMAC-MD5";
+  secret "i8nFYnOG5RTygCJlsmRd5Fga3u157sN4ZktSOdUeMhnZRY6lKkGyd8GUsc2yu5EgjWiD8D95mlLZtRR0y6O2qQ==";
+};
+
+
+zone "dyn.informatimago.com." {
+  file "/etc/bind/zones/dyn.informatimago.com.zone";
+  type master;
+  notify yes;
+  allow-update{
+    key dyn.informatimago.com.;
+  };
+  also-notify {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+  allow-transfer {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+};
+
+
+// zone "intergruas.com." {
+// file "/etc/bind/zones/intergruas.com.zone";
+// type master;
+// notify yes;
+// also-notify {
+// 62.93.173.252;   /* intergruas.easynet.es */
+// 212.4.112.252; /* intergruas.gnet.es */
+// 97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+// };
+// allow-transfer {
+// 62.93.173.252;   /* intergruas.easynet.es */
+// 212.4.112.252; /* intergruas.gnet.es */
+// 97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+// };
+// };
+
+
+zone "ogamita.com." {
+  file "/etc/bind/zones/ogamita.com.zone";
+  type master;
+  notify yes;
+  also-notify {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+  allow-transfer {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+};
+
+
+zone "ogamita.org." {
+  file "/etc/bind/zones/ogamita.org.zone";
+  type master;
+  notify yes;
+  also-notify {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+  allow-transfer {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+};
+
+
+zone "parroquias-manga.org." {
+  file "/etc/bind/zones/parroquias-manga.org.zone";
+  type master;
+  notify yes;
+  also-notify {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+  allow-transfer {
+    // 62.93.173.252;   /* intergruas.easynet.es */
+    // 212.4.112.252; /* intergruas.gnet.es */
+    97.74.107.15; 97.74.107.16; /* domaincontrol.com */
+  };
+};
+
diff --git a/ddns/Makefile b/ddns/Makefile
index a57ae7c..5f6ce72 100644
--- a/ddns/Makefile
+++ b/ddns/Makefile
@@ -37,7 +37,8 @@ CCL            = ccl
 CCL_EVAL       =  --eval
 CCL_LOAD       =  --load

-CLISP          = /usr/local/bin/clisp -ansi #-q
+#CLISP          = /usr/local/bin/clisp
+CLISP          = /data/languages/clisp/bin/clisp
 CLISP_LOAD     =
 CLISP_EVAL     = -repl -x

@@ -54,9 +55,9 @@ all: server client
 # 	$(LISP) $(LOAD) generate-client.lisp

 server:
-	clisp -ansi -x '(load "generate-server.lisp")'
+	$(CLISP) -ansi -x '(load "generate-server.lisp")'
 client:
-	clisp -ansi -x '(load "generate-client.lisp")'
+	$(CLISP) -ansi -x '(load "generate-client.lisp")'

 variables:
 	which clisp
diff --git a/ddns/README b/ddns/README
index b6038dd..994b23c 100644
--- a/ddns/README
+++ b/ddns/README
@@ -4,6 +4,9 @@ On kuiper, /usr/local/sbin/ddns-client is run from root
 /etc/fcron/fcrontab.
 /root/dnskeys/

+5  *    * * *   root    /usr/local/sbin/ddns-client -- kuiper
+
+
 On voyager, /home/ddns/bin/ddns-server is run from ddns in a screen
-launched from /etc/init.d/local-daemons.
+launched from /etc/rc.local
 /home/ddns/dnskeys/
diff --git a/ddns/client.lisp b/ddns/client.lisp
index 543c63d..9fb19d5 100644
--- a/ddns/client.lisp
+++ b/ddns/client.lisp
@@ -81,8 +81,10 @@


 (defun main ()
-  (update (first ext:*args*)
-          ;; :ddns-server  "voyager.informatimago.com"
-          ))
+  (if (null ext:*args*)
+      (error "Missing argument, try: ddns-client -- kuiper")
+      (update (first ext:*args*)
+              ;; :ddns-server  "voyager.informatimago.com"
+              )))

 ;;;; THE END ;;;;
diff --git a/zones-voyager/Makefile b/zones-voyager/Makefile
index d56ff3b..a601bc9 100644
--- a/zones-voyager/Makefile
+++ b/zones-voyager/Makefile
@@ -1,6 +1,5 @@
 ZONES=\
 	informatimago.com.zone \
-	intergruas.com.zone \
 	ogamita.com.zone \
 	ogamita.org.zone \
 	parroquias-manga.org.zone
diff --git a/zones-voyager/dyn.informatimago.com.zone b/zones-voyager/dyn.informatimago.com.zone
index 9f13410..3a1e4a3 100644
--- a/zones-voyager/dyn.informatimago.com.zone
+++ b/zones-voyager/dyn.informatimago.com.zone
@@ -1,7 +1,7 @@
 $ORIGIN .
 $TTL 86400	; 1 day
 dyn.informatimago.com	IN SOA	static.88-198-62-69.clients.your-server.de. informatimago.terra.es. (
-				2012060602 ; serial
+				2012060640 ; serial
 				10800      ; refresh (3 hours)
 				900        ; retry (15 minutes)
 				604800     ; expire (1 week)
@@ -15,4 +15,6 @@ $TTL 3600	; 1 hour
 			MX	0 voyager.informatimago.com.
 $ORIGIN dyn.informatimago.com.
 $TTL 10	; 10 seconds
-ono			A	46.193.64.247
+kuiper			A	86.212.32.143
+ono			A	92.140.3.120
+wifirst			A	46.193.64.247
diff --git a/zones-voyager/informatimago.com.zone b/zones-voyager/informatimago.com.zone
index d74b1f6..582ef91 100644
--- a/zones-voyager/informatimago.com.zone
+++ b/zones-voyager/informatimago.com.zone
@@ -1,7 +1,7 @@
 $TTL    3600
 $ORIGIN informatimago.com.
 @       1D      IN      SOA  static.88-198-62-69.clients.your-server.de.  informatimago.terra.es. (
-                                        2013010319              ; serial (d. adams)
+                                        2014030212              ; serial (d. adams)
                                         3H              ; refresh
                                         15M             ; retry
                                         1W              ; expiry
@@ -9,7 +9,7 @@ $ORIGIN informatimago.com.

 ; NS Records
 @                               3600  IN  NS     static.88-198-62-69.clients.your-server.de.
-@                                300  IN  NS     intergruas.gnet.es.
+@                               3600  IN  NS     intergruas.gnet.es.
 @                               3600  IN  NS     pdns01.domaincontrol.com.
 @                               3600  IN  NS     pdns02.domaincontrol.com.

@@ -29,7 +29,7 @@ ono                             3600  IN  CNAME  ono.dyn.informatimago.com.
 ;
 ; regular moons: naiad thalassa despina galatea larissa proteus
 ; rings: galle le-verrier adams
-; irregular moonds: triton nereid halimede sao laomedeia neso psamathe
+; irregular moons: triton nereid halimede sao laomedeia neso psamathe
 ;
 ; order of decreasing diameter:
 ; triton proteus nereid larissa galatea despina thalassa naiad halimede neso sao laomedeia psamathe
@@ -44,29 +44,30 @@ ono                             3600  IN  CNAME  ono.dyn.informatimago.com.
 ; (of nereid) G.P. Kuiper


-; dxo lan
-
-ergo.dxo                        3600  IN  A      172.16.11.98
-test-hg.dxo                     3600  IN  A      172.16.0.26
-

+;----------------------------------------
 ; lan.informatimago.com:

-thalassa.lan                    3600  IN  A      192.168.7.15
-proteus.lan                     3600  IN  A      192.168.7.2
-hubble.lan                      3600  IN  A      192.168.7.3
-galatea.lan                     3600  IN  A      192.168.7.4
-triton.lan                      3600  IN  A      192.168.7.5
-galle.lan                       3600  IN  A      192.168.7.6
+thalassa.lan     3600  IN  A      192.168.7.1       ;                                           child of poseidon
+proteus.lan      3600  IN  A      192.168.7.2       ;                                           child of poseidon
+hubble.lan       3600  IN  A      192.168.7.3       ;                                           astronomer
+galatea.lan      3600  IN  A      192.168.7.4       ; MacMini, MacOSX 10.7                      specific nereid
+triton.lan       3600  IN  A      192.168.7.5       ; PowerBook G4, MacOSX 10.5                 child of poseidon
+galle.lan        3600  IN  A      192.168.7.6       ; Acer netwbook Linux, MS-Windows-XP        ring
+lassell.lan      3600  IN  A      192.168.7.7       ; Athlon 64, MS-Windows-7                   discoverer of triton
+larissa.lan      3600  IN  A      192.168.7.8       ;                                           lover of poseidon
+kuiper.lan       3600  IN  A      192.168.7.9       ; Mountain Linux workstation                discoverer of nereid
+despina.lan      3600  IN  A      192.168.7.10      ; VirtualBox, MacOSX-10-8                   child of poseidon
+naiad.lan        3600  IN  A      192.168.7.11      ; iPad, iOS 5                               minor water deity
+nereid.lan       3600  IN  A      192.168.7.12      ; samsung s4                                minor water deity
+halimede.lan     3600  IN  A      192.168.7.13      ;                                           specific nereid
+neso.lan         3600  IN  A      192.168.7.14      ;                                           specific nereid
+sao.lan          3600  IN  A      192.168.7.15      ;                                           specific nereid
+laomedeia.lan    3600  IN  A      192.168.7.16      ;                                           specific nereid
+psamathe.lan     3600  IN  A      192.168.7.17      ;                                           specific nereid
+le-verrier.lan   3600  IN  A      192.168.7.18      ;                                           ring
+adams.lan        3600  IN  A      192.168.7.19      ;                                           ring

-lassell.lan                     3600  IN  A      192.168.7.7
-larissa.lan                     3600  IN  A      192.168.7.8
-kuiper.lan                      3600  IN  A      192.168.7.9
-despina.lan                     3600  IN  A      192.168.7.10
-naiad.lan                       3600  IN  A      192.168.7.11
-nereide.lan                     3600  IN  A      192.168.7.12
-
-le-verrier.lan                  3600  IN  A      192.168.7.14

 ; vm.informatimago.com:

@@ -113,9 +114,50 @@ livebox.lan                     3600  IN  A      192.168.7.253
 draytek.lan                     3600  IN  A      192.168.7.254


+
+first.dhcp                      3699  IN  A      192.168.7.192
+dmz                             3699  IN  A      192.168.7.192
+visitor-193.dhcp                3699  IN  A      192.168.7.193
+visitor-194.dhcp                3699  IN  A      192.168.7.194
+visitor-195.dhcp                3699  IN  A      192.168.7.195
+visitor-196.dhcp                3699  IN  A      192.168.7.196
+visitor-197.dhcp                3699  IN  A      192.168.7.197
+visitor-198.dhcp                3699  IN  A      192.168.7.198
+visitor-199.dhcp                3699  IN  A      192.168.7.199
+visitor-200.dhcp                3699  IN  A      192.168.7.200
+visitor-201.dhcp                3699  IN  A      192.168.7.201
+visitor-202.dhcp                3699  IN  A      192.168.7.202
+visitor-203.dhcp                3699  IN  A      192.168.7.203
+visitor-204.dhcp                3699  IN  A      192.168.7.204
+visitor-205.dhcp                3699  IN  A      192.168.7.205
+visitor-206.dhcp                3699  IN  A      192.168.7.206
+visitor-207.dhcp                3699  IN  A      192.168.7.207
+visitor-208.dhcp                3699  IN  A      192.168.7.208
+visitor-209.dhcp                3699  IN  A      192.168.7.209
+visitor-210.dhcp                3699  IN  A      192.168.7.210
+visitor-211.dhcp                3699  IN  A      192.168.7.211
+visitor-212.dhcp                3699  IN  A      192.168.7.212
+visitor-213.dhcp                3699  IN  A      192.168.7.213
+visitor-214.dhcp                3699  IN  A      192.168.7.214
+visitor-215.dhcp                3699  IN  A      192.168.7.215
+visitor-216.dhcp                3699  IN  A      192.168.7.216
+visitor-217.dhcp                3699  IN  A      192.168.7.217
+visitor-218.dhcp                3699  IN  A      192.168.7.218
+visitor-219.dhcp                3699  IN  A      192.168.7.219
+visitor-220.dhcp                3699  IN  A      192.168.7.220
+visitor-221.dhcp                3699  IN  A      192.168.7.221
+visitor-222.dhcp                3699  IN  A      192.168.7.222
+visitor-223.dhcp                3699  IN  A      192.168.7.223
+last.dhcp                       3699  IN  A      192.168.7.223
+
+
 ; CNAME Records
 router.lan                      3600  IN  CNAME  livebox.lan.informatimago.com.

+kuiper                          3600  IN  CNAME  kuiper.dyn.informatimago.com.
+noos                            3600  IN  CNAME  kuiper.dyn.informatimago.com.
+claar                           3600  IN  CNAME  kuiper.dyn.informatimago.com.
+
 www                             3600  IN  CNAME  voyager.informatimago.com.
 imap                            3600  IN  CNAME  voyager.informatimago.com.
 wizards                         3600  IN  CNAME  voyager.informatimago.com.
@@ -133,15 +175,6 @@ fossil                          3600  IN  CNAME  voyager.informatimago.com.
 clis                            3600  IN  CNAME  voyager.informatimago.com.
 don.voyager                     3600  IN  CNAME  voyager.informatimago.com.

-noos                            3600  IN  CNAME  ono.informatimago.com.
-claar                           3600  IN  CNAME  ono.informatimago.com.
-
-thalassa                        3600  IN  CNAME  ono.informatimago.com.
-proteus                         3600  IN  CNAME  ono.informatimago.com.
-hubble                          3600  IN  CNAME  ono.informatimago.com.
-galatea                         3600  IN  CNAME  ono.informatimago.com.
-triton                          3600  IN  CNAME  ono.informatimago.com.
-galle                           3600  IN  CNAME  ono.informatimago.com.



diff --git a/zones-voyager/intergruas.com.zone b/zones-voyager/intergruas.com.zone
deleted file mode 100644
index 314f92f..0000000
--- a/zones-voyager/intergruas.com.zone
+++ /dev/null
@@ -1,63 +0,0 @@
-$TTL     300
-$ORIGIN intergruas.com.
-@       1D      IN      SOA  static.88-198-62-69.clients.your-server.de.  informatimago.terra.es. (
-					2012060602		; serial
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )
-
-; NS Records
-@                                300  IN  NS     static.88-198-62-69.clients.your-server.de.
-@                                300  IN  NS     intergruas.gnet.es.
-@                                300  IN  NS     pdns01.domaincontrol.com.
-@                                300  IN  NS     pdns02.domaincontrol.com.
-
-
-
-; A Records
-
-; voyager.informatimago.
-@                                300  IN  A      88.198.62.69
-
-;intergruas.easynet.es.
-neuron.old                       300  IN  A      62.93.173.252
-los-belones.old                  300  IN  A      62.93.173.252
-
-; intergruas.gnet.es.
-neuron                           300  IN  A      212.4.112.252
-los-belones                      300  IN  A      212.4.112.252
-
-
-router.lan                       300  IN  A      192.168.166.1
-neuron.lan                       300  IN  A      192.168.166.2
-printer                          300  IN  A      192.168.166.38
-printer.lan                      300  IN  A      192.168.166.38
-manzanita.lan                    300  IN  A      192.168.166.90
-charming.lan                     300  IN  A      192.168.166.91
-plantus.lan                      300  IN  A      192.168.166.95
-broadcast.lan                    300  IN  A      192.168.166.255
-
-; CNAME Records
-
-mail                             300  IN  CNAME  neuron.intergruas.com.
-smtp                             300  IN  CNAME  neuron.intergruas.com.
-imap                             300  IN  CNAME  neuron.intergruas.com.
-pop                              300  IN  CNAME  neuron.intergruas.com.
-ldap                             300  IN  CNAME  neuron.intergruas.com.
-ftp                              300  IN  CNAME  neuron.intergruas.com.
-
-www                              300  IN  CNAME  voyager.informatimago.com.
-dealnet                          300  IN  CNAME  voyager.informatimago.com.
-asia                             300  IN  CNAME  voyager.informatimago.com.
-india                            300  IN  CNAME  voyager.informatimago.com.
-
-; MX Records
-@                                300  IN  MX     10 neuron.intergruas.com.
-
-
-; TXT Records
-@                                300  IN  TXT    "v=spf1 a mx ~all"
-
-; http://www.openspf.org/Project_Overview
-;;;; THE END ;;;;
diff --git a/zones-voyager/ogamita.com.zone b/zones-voyager/ogamita.com.zone
index c5396d6..7c02af8 100644
--- a/zones-voyager/ogamita.com.zone
+++ b/zones-voyager/ogamita.com.zone
@@ -1,7 +1,7 @@
 $TTL    3600
 $ORIGIN ogamita.com.
 @       1D      IN      SOA  static.88-198-62-69.clients.your-server.de.  informatimago.terra.es. (
-					2012060600		; serial (d. adams)
+					2013120702		; serial (d. adams)
 					3H		; refresh
 					15M		; retry
 					1W		; expiry
@@ -9,7 +9,7 @@ $ORIGIN ogamita.com.

 ; NS Records
 @                               3600  IN  NS     static.88-198-62-69.clients.your-server.de.
-@                                300  IN  NS     intergruas.gnet.es.
+@                               3600  IN  NS     intergruas.gnet.es.
 @                               3600  IN  NS     pdns01.domaincontrol.com.
 @                               3600  IN  NS     pdns02.domaincontrol.com.

@@ -27,6 +27,7 @@ smtp                           3600  IN CNAME  voyager.informatimago.com.
 mirror                         3600  IN CNAME  voyager.informatimago.com.
 www                            3600  IN CNAME  voyager.informatimago.com.
 ftp                            3600  IN CNAME  voyager.informatimago.com.
+lists                          3600  IN CNAME  voyager.informatimago.com.

 nasium-lse                     3600  IN CNAME  voyager.informatimago.com.
 fossil.nasium-lse              3600  IN CNAME  voyager.informatimago.com.
diff --git a/zones-voyager/ogamita.org.zone b/zones-voyager/ogamita.org.zone
index 1685e9a..d9f5532 100644
--- a/zones-voyager/ogamita.org.zone
+++ b/zones-voyager/ogamita.org.zone
@@ -1,7 +1,7 @@
 $TTL    3600
 $ORIGIN ogamita.org.
 @       1D      IN      SOA  static.88-198-62-69.clients.your-server.de.  informatimago.terra.es. (
-					2012122300		; serial (d. adams)
+					2014011700		; serial (d. adams)
 					3H		; refresh
 					15M		; retry
 					1W		; expiry
@@ -9,7 +9,7 @@ $ORIGIN ogamita.org.

 ; NS Records
 @                               3600  IN  NS     static.88-198-62-69.clients.your-server.de.
-@                                300  IN  NS     intergruas.gnet.es.
+@                               3600  IN  NS     intergruas.gnet.es.
 @                               3600  IN  NS     pdns01.domaincontrol.com.
 @                               3600  IN  NS     pdns02.domaincontrol.com.

@@ -31,6 +31,7 @@ smtp.bolet                      3600  IN  CNAME  bolet.no-ip.com.
 pinaud.bolet                    3600  IN  CNAME  bolet.no-ip.com.
 mail.bolet                      3600  IN  CNAME  bolet.no-ip.com.

+git.lisp                        3600  IN  CNAME  voyager.informatimago.com.

 flocoiffure                     3600  IN  CNAME  voyager.informatimago.com.
 www.flocoiffure                 3600  IN  CNAME  voyager.informatimago.com.
diff --git a/zones-voyager/parroquias-manga.org.zone b/zones-voyager/parroquias-manga.org.zone
index adb69ac..7d876ce 100644
--- a/zones-voyager/parroquias-manga.org.zone
+++ b/zones-voyager/parroquias-manga.org.zone
@@ -1,7 +1,7 @@
 $TTL    3600
 $ORIGIN parroquias-manga.org.
 @       1D      IN      SOA  static.88-198-62-69.clients.your-server.de.  informatimago.terra.es. (
-					2012060600		; serial (d. adams)
+					2013120700		; serial (d. adams)
 					3H		; refresh
 					15M		; retry
 					1W		; expiry
@@ -9,7 +9,7 @@ $ORIGIN parroquias-manga.org.

 ; NS Records
 @                               3600  IN  NS     static.88-198-62-69.clients.your-server.de.
-@                                300  IN  NS     intergruas.gnet.es.
+@                               3600  IN  NS     intergruas.gnet.es.
 @                               3600  IN  NS     pdns01.domaincontrol.com.
 @                               3600  IN  NS     pdns02.domaincontrol.com.
ViewGit