fix dns zones

container-eve.json

@@ -134,6 +134,12 @@
       "ipv6": "2a01:4f8:210:31fd:1::1/128",
       "ula": "fdc0:4992:6a6d::1/128"
     },
+    "dn42-2": {
+      "ipv4": "172.23.75.64/32",
+      "ipv6": "2a03:b0c0:0:1010::3d:b001",
+      "ula": "fdc0:4992:6a6d::1/128",
+      "lxc": false
+    },
     "faces": {
       "ipv4": "172.23.75.7/32",
       "ipv6": "2a01:4f8:210:31fd:1::7/128",
@@ -395,7 +401,6 @@
       },
       "vars": {
         "ssh_ldap": true,
-        "install_dn42_ca": false,
         "add_repo_in_pacman_conf": false,
         "additional_admins": [
           {

hooks/templates/higgsboson.tk.zone.erb

@@ -6,7 +6,7 @@ $TTL 300
     86400   ; expire
     3600)   ; minimum
 
-;; NS Records (YOU MUST CHANGE THIS)
+;; NS Records
   NS ns1
   NS ns2
 
@@ -43,13 +43,20 @@ reisekosten CNAME reisekosten.herokuapp.com.
 
 ;; A Records (IPv4 addresses)
 <% if type == :eve -%>
-* A 192.168.66.5
+* A 172.23.75.5
 <% else -%>
 * A 148.251.132.243
 <% end -%>
 
 dn42 A 148.251.132.243
-<%= resolver.aaaa("dn42", "eve.higgsboson.tk") -%>
+dn42 AAAA 2a01:4f8:210:31fd:1::1
+dn42-2 A 188.166.16.37
+dn42-2 AAAA 2a03:b0c0:0:1010::3d:b001
+
+ovpn1 A 148.251.132.243
+ovpn1 AAAA 2a01:4f8:210:31fd:1::1
+ovpn2 A 188.166.16.37
+ovpn2 AAAA 2a03:b0c0:0:1010::3d:b001
 
 ;; eve -->
 <% eve_services = %w{@ classifier eve jabber login mail ns1 web} -%>

hooks/templates/lxc-zone.erb

@@ -8,10 +8,9 @@ $TTL <%= data["zone"]["ttl"] %>
                     <%= data["zone"]["retry"] %> ; retry
                     <%= data["zone"]["expire"] %> ; expire
                     <%= data["zone"]["minimum"] %>) ; minimum
-
 <% data["network"].each do |name, value| -%>
 <% if value["ns"] -%>
-  NS <%= fqdn(name) %>
+  IN NS <%= name %>.
 <% end -%>
 <% end -%>
 

hooks/templates/rdns-zone.erb

@@ -6,7 +6,7 @@
                     <%= data["zone"]["minimum"] %>) ; minimum
 <% data["network"].each do |name, value| -%>
 <% if value["ns"] -%>
-  IN NS <%= fqdn(name) %>.<%= data["zone"]["domain"] %>.
+  IN NS <%= name %>.
 <% end -%>
 <% end -%>