Mic92
/
lxc-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix dns zones

This commit is contained in:
Jörg Thalheim 2015-11-29 18:39:32 +00:00
parent 4a5caddd23
commit 2a1e001cb5
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
container-eve.json
View File

@ -134,6 +134,12 @@
"ipv6": "2a01:4f8:210:31fd:1::1/128", "ipv6": "2a01:4f8:210:31fd:1::1/128",
"ula": "fdc0:4992:6a6d::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": { "faces": {
"ipv4": "172.23.75.7/32", "ipv4": "172.23.75.7/32",
"ipv6": "2a01:4f8:210:31fd:1::7/128", "ipv6": "2a01:4f8:210:31fd:1::7/128",
@ -395,7 +401,6 @@
}, },
"vars": { "vars": {
"ssh_ldap": true, "ssh_ldap": true,
"install_dn42_ca": false,
"add_repo_in_pacman_conf": false, "add_repo_in_pacman_conf": false,
"additional_admins": [ "additional_admins": [
{ {

13
hooks/templates/higgsboson.tk.zone.erb
View File

@ -6,7 +6,7 @@ $TTL 300
86400 ; expire 86400 ; expire
3600) ; minimum 3600) ; minimum
;; NS Records (YOU MUST CHANGE THIS) ;; NS Records
NS ns1 NS ns1
NS ns2 NS ns2
@ -43,13 +43,20 @@ reisekosten CNAME reisekosten.herokuapp.com.
;; A Records (IPv4 addresses) ;; A Records (IPv4 addresses)
<% if type == :eve -%> <% if type == :eve -%>
* A 192.168.66.5 * A 172.23.75.5
<% else -%> <% else -%>
* A 148.251.132.243 * A 148.251.132.243
<% end -%> <% end -%>
dn42 A 148.251.132.243 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 -->
<% eve_services = %w{@ classifier eve jabber login mail ns1 web} -%> <% eve_services = %w{@ classifier eve jabber login mail ns1 web} -%>

3
hooks/templates/lxc-zone.erb
View File

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

2
hooks/templates/rdns-zone.erb
View File

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