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

new ip subnet configuration

Browse Source
This commit is contained in:
Jörg Thalheim 2015-01-14 20:29:57 +00:00
parent dd98b05dfa
commit 51ae348edb
7 changed files with 277 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
container.json
View File

@ -2,17 +2,21 @@
"zone": {
"soa": "higgsboson.tk.",
"ns": "higgsboson.tk.",
"serial": 65,
"serial": 94,
"refresh": "1H",
"retry": "4H",
"expire": "3W",
"minimum": "1D",
"v4_subnet": "10.100.0.0/16",
"v4_subnet": "192.168.66.0/16",
"v6_subnet": "2a01:4f8:210:31fd:1::/80"
},
"network": {
"eve": {
"ipv6": "2a01:4f8:210:31fd::1",
"lxc": false
},
"bridge": {
"ipv4": "10.100.0.1/32",
"ipv4": "192.168.66.1/32",
"ipv6": "2a01:4f8:210:31fd:1::1/128",
"lxc": false
},
@ -20,38 +24,46 @@
"cname": "prosody",
"lxc": false
},
"_xmpp-client._tcp": {
"srv": "0 5 5222 jabber",
"lxc": false
},
"olddevkid": {
"ipv4": "10.100.0.100/32",
"ipv4": "192.168.66.100/32",
"ipv6": "2a01:4f8:210:31fd:1::40/128",
"lxc": false
},
"base": {
"ipv4": "10.100.0.2/32",
"ipv4": "192.168.66.2/32",
"ipv6": "2a01:4f8:210:31fd:1::2/128"
},
"ldap": {
"ipv4": "10.100.0.3/32",
"ipv4": "192.168.66.3/32",
"ipv6": "2a01:4f8:210:31fd:1::3/128",
"group": "php"
},
"web": {
"ipv4": "10.100.0.5/32",
"ipv4": "192.168.66.5/32",
"ipv6": "2a01:4f8:210:31fd:1::5/128"
},
"dns": {
"ipv4": "10.100.0.6/32",
"ipv6": "2a01:4f8:210:31fd:1::6/128"
"ipv4": "192.168.66.6/32",
"ipv6": "2a01:4f8:210:31fd:1::6/128",
"rdns6": "ns.higgsboson.tk",
"dn42": {
"ipv4": "172.23.75.4"
}
},
"faces": {
"ipv4": "10.100.0.7/32",
"ipv4": "192.168.66.7/32",
"ipv6": "2a01:4f8:210:31fd:1::7/128"
},
"jtes": {
"ipv4": "10.100.0.8/32",
"ipv4": "192.168.66.8/32",
"ipv6": "2a01:4f8:210:31fd:1::8/128"
},
"mysql": {
"ipv4": "10.100.0.9/32",
"ipv4": "192.168.66.9/32",
"ipv6": "2a01:4f8:210:31fd:1::9/128",
"backup-scripts": [
{
@ -60,12 +72,16 @@
}
]
},
"gitweb": {
"cname": "web",
"lxc": false
},
"git": {
"ipv4": "10.100.0.4/32",
"ipv4": "192.168.66.4/32",
"ipv6": "2a01:4f8:210:31fd:1::4/128"
},
"postgres": {
"ipv4": "10.100.0.10/32",
"ipv4": "192.168.66.10/32",
"ipv6": "2a01:4f8:210:31fd:1::a/128",
"backup-scripts": [
{
@ -75,7 +91,7 @@
]
},
"phpmyadmin": {
"ipv4": "10.100.0.11/32",
"ipv4": "192.168.66.11/32",
"ipv6": "2a01:4f8:210:31fd:1::b/128",
"group": "php",
"vars": {
@ -86,7 +102,7 @@
}
},
"phppgadmin": {
"ipv4": "10.100.0.13/32",
"ipv4": "192.168.66.13/32",
"ipv6": "2a01:4f8:210:31fd:1::d/128",
"group": "php",
"vars": {
@ -97,7 +113,7 @@
}
},
"adminer": {
"ipv4": "10.100.0.14/32",
"ipv4": "192.168.66.14/32",
"ipv6": "2a01:4f8:210:31fd:1::e/128",
"group": "php",
"vars": {
@ -110,14 +126,14 @@
}
},
"mail": {
"ipv4": "10.100.0.16/32",
"ipv4": "192.168.66.16/32",
"ipv6": "2a01:4f8:210:31fd:1::10/128",
"backup-paths": [
"var/vmail"
]
},
"istwiki": {
"ipv4": "10.100.0.17/32",
"ipv4": "192.168.66.17/32",
"ipv6": "2a01:4f8:210:31fd:1::11/128",
"group": "php",
"vars": {
@ -128,7 +144,7 @@
}
},
"ytm": {
"ipv4": "10.100.0.18/32",
"ipv4": "192.168.66.18/32",
"ipv6": "2a01:4f8:210:31fd:1::12/128",
"group": "php",
"vars": {
@ -140,7 +156,7 @@
}
},
"ldapadmin": {
"ipv4": "10.100.0.12/32",
"ipv4": "192.168.66.12/32",
"ipv6": "2a01:4f8:210:31fd:1::c/128",
"group": "php",
"vars": {
@ -150,7 +166,7 @@
}
},
"rainloop": {
"ipv4": "10.100.0.19/32",
"ipv4": "192.168.66.19/32",
"ipv6": "2a01:4f8:210:31fd:1::13/128",
"group": "php",
"vars": {
@ -162,7 +178,7 @@
}
},
"owncloud": {
"ipv4": "10.100.0.15/32",
"ipv4": "192.168.66.15/32",
"ipv6": "2a01:4f8:210:31fd:1::f/128",
"group": "php",
"vars": {
@ -185,7 +201,7 @@
}
},
"ttrss": {
"ipv4": "10.100.0.20/32",
"ipv4": "192.168.66.20/32",
"ipv6": "2a01:4f8:210:31fd:1::14/128",
"group": "php",
"vars": {
@ -201,7 +217,7 @@
}
},
"teamspeak": {
"ipv4": "10.100.0.21/32",
"ipv4": "192.168.66.21/32",
"ipv6": "2a01:4f8:210:31fd:1::15/128",
"group": null,
"vars": null,
@ -210,16 +226,17 @@
]
},
"prosody": {
"ipv4": "10.100.0.22/32",
"ipv4": "192.168.66.22/32",
"ipv6": "2a01:4f8:210:31fd:1::16/128",
"group": null,
"vars": null,
"rdns6": "jabber.higgsboson.tk",
"backup-paths": [
"var/lib/prosody"
]
},
"piwik": {
"ipv4": "10.100.0.23/32",
"ipv4": "192.168.66.23/32",
"ipv6": "2a01:4f8:210:31fd:1::17/128",
"group": "php",
"vars": {
@ -233,7 +250,7 @@
}
},
"tweetnest": {
"ipv4": "10.100.0.24/32",
"ipv4": "192.168.66.24/32",
"ipv6": "2a01:4f8:210:31fd:1::18/128",
"group": "php",
"vars": {
@ -246,28 +263,68 @@
}
},
"etherpad": {
"ipv4": "10.100.0.25/32",
"ipv4": "192.168.66.25/32",
"ipv6": "2a01:4f8:210:31fd:1::19/128",
"group": null,
"vars": null
},
"pyload": {
"ipv4": "10.100.0.26/32",
"ipv4": "192.168.66.26/32",
"ipv6": "2a01:4f8:210:31fd:1::1a/128",
"group": null,
"vars": null
},
"squid": {
"ipv4": "10.100.0.27/32",
"ipv4": "192.168.66.27/32",
"ipv6": "2a01:4f8:210:31fd:1::1b/128",
"group": null,
"vars": null
},
"classifier": {
"ipv4": "10.100.0.28/32",
"ipv4": "192.168.66.28/32",
"ipv6": "2a01:4f8:210:31fd:1::1c/128",
"group": null,
"vars": null
},
"seafile": {
"ipv4": "192.168.66.29/32",
"ipv6": "2a01:4f8:210:31fd:1::1d/128",
"group": null,
"vars": null
},
"login": {
"ipv4": "192.168.66.30/32",
"ipv6": "2a01:4f8:210:31fd:1::1e/128",
"group": null,
"vars": {
"ssh_ldap": true
}
},
"dn42": {
"ipv4": "192.168.66.31/32",
"ipv6": "2a01:4f8:210:31fd:1::1f/128",
"group": null,
"vars": null
},
"halfcode": {
"ipv4": "192.168.66.32/32",
"ipv6": "2a01:4f8:210:31fd:1::20/128",
"group": "php",
"vars": {
"php_extensions": [
]
}
},
"phonefinder": {
"ipv4": "192.168.66.33/32",
"ipv6": "2a01:4f8:210:31fd:1::21/128",
"group": "php",
"vars": {
"php_extensions": [
"[@]"
]
}
}
}
}

2
default.conf
View File

@ -7,7 +7,7 @@ lxc.network.link = br0
lxc.network.flags = up
lxc.network.name = eth0
lxc.network.mtu = 1500
lxc.network.ipv4.gateway = auto
lxc.network.ipv4.gateway = 192.168.66.1
lxc.network.ipv6.gateway = 2a01:4f8:210:31fd:1::1
# cgroups

5
hooks/dn42-routes
View File

@ -1,6 +1,5 @@
#!/bin/bash
/usr/bin/ip a 1>&2
/usr/bin/ip route add 172.16.0.0/12 via 192.168.66.31 proto static
/usr/bin/ip route add 10.0.0.0/8 via 192.168.66.31 proto static
/usr/bin/ip route add 172.16.0.0/12 via 172.16.75.1 proto static
/usr/bin/ip route add 10.0.0.0/8 via 172.16.75.1 proto static
exit 0

14
zones/1.0.0.0.d.f.1.3.0.1.2.0.8.f.4.0.1.0.a.2.ip6.arpa
View File

@ -1,5 +1,5 @@
@ IN SOA higgsboson.tk. hostmaster (
65 ; serial
94 ; serial
1H ; refresh
4H ; retry
3W ; expire
@ -7,6 +7,8 @@
NS higgsboson.tk.
1.0.0.0.0.0.0.0.0.0.0.0 PTR eve.lxc.
1.0.0.0.0.0.0.0.0.0.0.0 PTR bridge.lxc.
0.4.0.0.0.0.0.0.0.0.0.0 PTR olddevkid.lxc.
@ -64,3 +66,13 @@ a.1.0.0.0.0.0.0.0.0.0.0 PTR pyload.lxc.
b.1.0.0.0.0.0.0.0.0.0.0 PTR squid.lxc.
c.1.0.0.0.0.0.0.0.0.0.0 PTR classifier.lxc.
d.1.0.0.0.0.0.0.0.0.0.0 PTR seafile.lxc.
e.1.0.0.0.0.0.0.0.0.0.0 PTR login.lxc.
f.1.0.0.0.0.0.0.0.0.0.0 PTR dn42.lxc.
0.2.0.0.0.0.0.0.0.0.0.0 PTR halfcode.lxc.
1.2.0.0.0.0.0.0.0.0.0.0 PTR phonefinder.lxc.

66
zones/100.10.in-addr.arpa
View File

@ -1,66 +0,0 @@
@ IN SOA higgsboson.tk. hostmaster (
65 ; serial
1H ; refresh
4H ; retry
3W ; expire
1D) ; minimum
NS higgsboson.tk.
1.0 PTR bridge.lxc.
100.0 PTR olddevkid.lxc.
2.0 PTR base.lxc.
3.0 PTR ldap.lxc.
5.0 PTR web.lxc.
6.0 PTR dns.lxc.
7.0 PTR faces.lxc.
8.0 PTR jtes.lxc.
9.0 PTR mysql.lxc.
4.0 PTR git.lxc.
10.0 PTR postgres.lxc.
11.0 PTR phpmyadmin.lxc.
13.0 PTR phppgadmin.lxc.
14.0 PTR adminer.lxc.
16.0 PTR mail.lxc.
17.0 PTR istwiki.lxc.
18.0 PTR ytm.lxc.
12.0 PTR ldapadmin.lxc.
19.0 PTR rainloop.lxc.
15.0 PTR owncloud.lxc.
20.0 PTR ttrss.lxc.
21.0 PTR teamspeak.lxc.
22.0 PTR prosody.lxc.
23.0 PTR piwik.lxc.
24.0 PTR tweetnest.lxc.
25.0 PTR etherpad.lxc.
26.0 PTR pyload.lxc.
27.0 PTR squid.lxc.
28.0 PTR classifier.lxc.

72
zones/66.168.192.in-addr.arpa Normal file
View File

@ -0,0 +1,72 @@
@ IN SOA higgsboson.tk. hostmaster (
69 ; serial
1H ; refresh
4H ; retry
3W ; expire
1D) ; minimum
NS higgsboson.tk.
1 PTR bridge.lxc.
100 PTR olddevkid.lxc.
2 PTR base.lxc.
3 PTR ldap.lxc.
5 PTR web.lxc.
6 PTR dns.lxc.
7 PTR faces.lxc.
8 PTR jtes.lxc.
9 PTR mysql.lxc.
4 PTR git.lxc.
10 PTR postgres.lxc.
11 PTR phpmyadmin.lxc.
13 PTR phppgadmin.lxc.
14 PTR adminer.lxc.
16 PTR mail.lxc.
17 PTR istwiki.lxc.
18 PTR ytm.lxc.
12 PTR ldapadmin.lxc.
19 PTR rainloop.lxc.
15 PTR owncloud.lxc.
20 PTR ttrss.lxc.
21 PTR teamspeak.lxc.
22 PTR prosody.lxc.
23 PTR piwik.lxc.
24 PTR tweetnest.lxc.
25 PTR etherpad.lxc.
26 PTR pyload.lxc.
27 PTR squid.lxc.
28 PTR classifier.lxc.
29 PTR seafile.lxc.
30 PTR login.lxc.
31 PTR dn42.lxc.

158
zones/lxc.zone
View File

@ -1,5 +1,5 @@
@ IN SOA higgsboson.tk. hostmaster (
65 ; serial
94 ; serial
1H ; refresh
4H ; retry
3W ; expire
@ -7,149 +7,189 @@
NS higgsboson.tk.
bridge A 10.100.0.1
ipv4.bridge A 10.100.0.1
eve AAAA 2a01:4f8:210:31fd::1
ipv6.eve AAAA 2a01:4f8:210:31fd::1
bridge A 192.168.66.1
ipv4.bridge A 192.168.66.1
bridge AAAA 2a01:4f8:210:31fd:1::1
ipv6.bridge AAAA 2a01:4f8:210:31fd:1::1
jabber CNAME prosody
olddevkid A 10.100.0.100
ipv4.olddevkid A 10.100.0.100
_xmpp-client._tcp SRV 0 5 5222 jabber
olddevkid A 192.168.66.100
ipv4.olddevkid A 192.168.66.100
olddevkid AAAA 2a01:4f8:210:31fd:1::40
ipv6.olddevkid AAAA 2a01:4f8:210:31fd:1::40
base A 10.100.0.2
ipv4.base A 10.100.0.2
base A 192.168.66.2
ipv4.base A 192.168.66.2
base AAAA 2a01:4f8:210:31fd:1::2
ipv6.base AAAA 2a01:4f8:210:31fd:1::2
ldap A 10.100.0.3
ipv4.ldap A 10.100.0.3
ldap A 192.168.66.3
ipv4.ldap A 192.168.66.3
ldap AAAA 2a01:4f8:210:31fd:1::3
ipv6.ldap AAAA 2a01:4f8:210:31fd:1::3
web A 10.100.0.5
ipv4.web A 10.100.0.5
web A 192.168.66.5
ipv4.web A 192.168.66.5
web AAAA 2a01:4f8:210:31fd:1::5
ipv6.web AAAA 2a01:4f8:210:31fd:1::5
dns A 10.100.0.6
ipv4.dns A 10.100.0.6
dns A 192.168.66.6
ipv4.dns A 192.168.66.6
dns AAAA 2a01:4f8:210:31fd:1::6
ipv6.dns AAAA 2a01:4f8:210:31fd:1::6
faces A 10.100.0.7
ipv4.faces A 10.100.0.7
faces A 192.168.66.7
ipv4.faces A 192.168.66.7
faces AAAA 2a01:4f8:210:31fd:1::7
ipv6.faces AAAA 2a01:4f8:210:31fd:1::7
jtes A 10.100.0.8
ipv4.jtes A 10.100.0.8
jtes A 192.168.66.8
ipv4.jtes A 192.168.66.8
jtes AAAA 2a01:4f8:210:31fd:1::8
ipv6.jtes AAAA 2a01:4f8:210:31fd:1::8
mysql A 10.100.0.9
ipv4.mysql A 10.100.0.9
mysql A 192.168.66.9
ipv4.mysql A 192.168.66.9
mysql AAAA 2a01:4f8:210:31fd:1::9
ipv6.mysql AAAA 2a01:4f8:210:31fd:1::9
git A 10.100.0.4
ipv4.git A 10.100.0.4
gitweb CNAME web
git A 192.168.66.4
ipv4.git A 192.168.66.4
git AAAA 2a01:4f8:210:31fd:1::4
ipv6.git AAAA 2a01:4f8:210:31fd:1::4
postgres A 10.100.0.10
ipv4.postgres A 10.100.0.10
postgres A 192.168.66.10
ipv4.postgres A 192.168.66.10
postgres AAAA 2a01:4f8:210:31fd:1::a
ipv6.postgres AAAA 2a01:4f8:210:31fd:1::a
phpmyadmin A 10.100.0.11
ipv4.phpmyadmin A 10.100.0.11
phpmyadmin A 192.168.66.11
ipv4.phpmyadmin A 192.168.66.11
phpmyadmin AAAA 2a01:4f8:210:31fd:1::b
ipv6.phpmyadmin AAAA 2a01:4f8:210:31fd:1::b
phppgadmin A 10.100.0.13
ipv4.phppgadmin A 10.100.0.13
phppgadmin A 192.168.66.13
ipv4.phppgadmin A 192.168.66.13
phppgadmin AAAA 2a01:4f8:210:31fd:1::d
ipv6.phppgadmin AAAA 2a01:4f8:210:31fd:1::d
adminer A 10.100.0.14
ipv4.adminer A 10.100.0.14
adminer A 192.168.66.14
ipv4.adminer A 192.168.66.14
adminer AAAA 2a01:4f8:210:31fd:1::e
ipv6.adminer AAAA 2a01:4f8:210:31fd:1::e
mail A 10.100.0.16
ipv4.mail A 10.100.0.16
mail A 192.168.66.16
ipv4.mail A 192.168.66.16
mail AAAA 2a01:4f8:210:31fd:1::10
ipv6.mail AAAA 2a01:4f8:210:31fd:1::10
istwiki A 10.100.0.17
ipv4.istwiki A 10.100.0.17
istwiki A 192.168.66.17
ipv4.istwiki A 192.168.66.17
istwiki AAAA 2a01:4f8:210:31fd:1::11
ipv6.istwiki AAAA 2a01:4f8:210:31fd:1::11
ytm A 10.100.0.18
ipv4.ytm A 10.100.0.18
ytm A 192.168.66.18
ipv4.ytm A 192.168.66.18
ytm AAAA 2a01:4f8:210:31fd:1::12
ipv6.ytm AAAA 2a01:4f8:210:31fd:1::12
ldapadmin A 10.100.0.12
ipv4.ldapadmin A 10.100.0.12
ldapadmin A 192.168.66.12
ipv4.ldapadmin A 192.168.66.12
ldapadmin AAAA 2a01:4f8:210:31fd:1::c
ipv6.ldapadmin AAAA 2a01:4f8:210:31fd:1::c
rainloop A 10.100.0.19
ipv4.rainloop A 10.100.0.19
rainloop A 192.168.66.19
ipv4.rainloop A 192.168.66.19
rainloop AAAA 2a01:4f8:210:31fd:1::13
ipv6.rainloop AAAA 2a01:4f8:210:31fd:1::13
owncloud A 10.100.0.15
ipv4.owncloud A 10.100.0.15
owncloud A 192.168.66.15
ipv4.owncloud A 192.168.66.15
owncloud AAAA 2a01:4f8:210:31fd:1::f
ipv6.owncloud AAAA 2a01:4f8:210:31fd:1::f
ttrss A 10.100.0.20
ipv4.ttrss A 10.100.0.20
ttrss A 192.168.66.20
ipv4.ttrss A 192.168.66.20
ttrss AAAA 2a01:4f8:210:31fd:1::14
ipv6.ttrss AAAA 2a01:4f8:210:31fd:1::14
teamspeak A 10.100.0.21
ipv4.teamspeak A 10.100.0.21
teamspeak A 192.168.66.21
ipv4.teamspeak A 192.168.66.21
teamspeak AAAA 2a01:4f8:210:31fd:1::15
ipv6.teamspeak AAAA 2a01:4f8:210:31fd:1::15
prosody A 10.100.0.22
ipv4.prosody A 10.100.0.22
prosody A 192.168.66.22
ipv4.prosody A 192.168.66.22
prosody AAAA 2a01:4f8:210:31fd:1::16
ipv6.prosody AAAA 2a01:4f8:210:31fd:1::16
piwik A 10.100.0.23
ipv4.piwik A 10.100.0.23
piwik A 192.168.66.23
ipv4.piwik A 192.168.66.23
piwik AAAA 2a01:4f8:210:31fd:1::17
ipv6.piwik AAAA 2a01:4f8:210:31fd:1::17
tweetnest A 10.100.0.24
ipv4.tweetnest A 10.100.0.24
tweetnest A 192.168.66.24
ipv4.tweetnest A 192.168.66.24
tweetnest AAAA 2a01:4f8:210:31fd:1::18
ipv6.tweetnest AAAA 2a01:4f8:210:31fd:1::18
etherpad A 10.100.0.25
ipv4.etherpad A 10.100.0.25
etherpad A 192.168.66.25
ipv4.etherpad A 192.168.66.25
etherpad AAAA 2a01:4f8:210:31fd:1::19
ipv6.etherpad AAAA 2a01:4f8:210:31fd:1::19
pyload A 10.100.0.26
ipv4.pyload A 10.100.0.26
pyload A 192.168.66.26
ipv4.pyload A 192.168.66.26
pyload AAAA 2a01:4f8:210:31fd:1::1a
ipv6.pyload AAAA 2a01:4f8:210:31fd:1::1a
squid A 10.100.0.27
ipv4.squid A 10.100.0.27
squid A 192.168.66.27
ipv4.squid A 192.168.66.27
squid AAAA 2a01:4f8:210:31fd:1::1b
ipv6.squid AAAA 2a01:4f8:210:31fd:1::1b
classifier A 10.100.0.28
ipv4.classifier A 10.100.0.28
classifier A 192.168.66.28
ipv4.classifier A 192.168.66.28
classifier AAAA 2a01:4f8:210:31fd:1::1c
ipv6.classifier AAAA 2a01:4f8:210:31fd:1::1c
seafile A 192.168.66.29
ipv4.seafile A 192.168.66.29
seafile AAAA 2a01:4f8:210:31fd:1::1d
ipv6.seafile AAAA 2a01:4f8:210:31fd:1::1d
login A 192.168.66.30
ipv4.login A 192.168.66.30
login AAAA 2a01:4f8:210:31fd:1::1e
ipv6.login AAAA 2a01:4f8:210:31fd:1::1e
dn42 A 192.168.66.31
ipv4.dn42 A 192.168.66.31
dn42 AAAA 2a01:4f8:210:31fd:1::1f
ipv6.dn42 AAAA 2a01:4f8:210:31fd:1::1f
halfcode A 192.168.66.32
ipv4.halfcode A 192.168.66.32
halfcode AAAA 2a01:4f8:210:31fd:1::20
ipv6.halfcode AAAA 2a01:4f8:210:31fd:1::20
phonefinder A 192.168.66.33
ipv4.phonefinder A 192.168.66.33
phonefinder AAAA 2a01:4f8:210:31fd:1::21
ipv6.phonefinder AAAA 2a01:4f8:210:31fd:1::21