From 52d7f76fb075f998bf10e99b6e6a34e44b10f381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 2 Feb 2016 22:16:42 +0000
Subject: [PATCH] new ula subnet

---
 container-eve.json | 266 +++++++++++----------------------------------
 1 file changed, 64 insertions(+), 202 deletions(-)

diff --git a/container-eve.json b/container-eve.json
index 7bb65df..c4c9aaa 100644
--- a/container-eve.json
+++ b/container-eve.json
@@ -1,23 +1,28 @@
 {
   "zone": {
     "soa": "ns1.higgsboson.tk.",
-    "serial": 200,
+    "serial": 216,
     "refresh": "1H",
     "hostmaster": "hostmaster.higgsboson.tk",
     "ipv6-domain": "eve.higgsboson.tk",
-    "ipv4-domain": "eve.evenet.dn42",
-    "ula-domain": "eve.evenet.dn42",
+    "dn42-domain": "eve.evenet.dn42",
     "ttl": 300,
     "a": "148.251.132.243",
     "aaaa": "2a01:4f8:210:31fd::1",
+    "dn42-a": "172.23.75.1",
+    "dn42-aaaa": "fd42:4992:6a6d::1",
     "retry": "4H",
     "expire": "3W",
     "minimum": "1D",
-    "v4_subnet": "172.23.75.0/26",
-    "ula_subnet": "fdc0:4992:6a6d::/80",
-    "v6_subnet": "2a01:4f8:210:31fd:1::/80",
-    "lxc_root": "/data/containers/",
-    "lxc-config": "/etc/lxc/default.conf"
+    "ipv4-subnet": "172.23.75.0/26",
+    "ula-subnet": "fd42:4992:6a6d::/80",
+    "ipv6-subnet": "2a01:4f8:210:31fd:1::/80",
+    "lxc-root": "/data/containers/",
+    "lxc-config": "/etc/lxc/default.conf",
+    "ns": [
+      "ns1.evenet.dn42",
+      "ns2.evenet.dn42"
+    ]
   },
   "network": {
     "eve": {
@@ -28,7 +33,7 @@
     "bridge": {
       "ipv4": "172.23.75.2",
       "ipv6": "2a01:4f8:210:31fd:1::2/128",
-      "ula": "fdc0:4992:6a6d::2/128",
+      "ula": "fd42:4992:6a6d::2/128",
       "lxc": false
     },
     "jabber": {
@@ -44,13 +49,12 @@
     "base": {
       "ipv4": "172.23.75.62/32",
       "ipv6": "2a01:4f8:210:31fd:1::3e/128",
-      "ula": "fdc0:4992:6a6d::3e/128"
+      "ula": "fd42:4992:6a6d::3e/128"
     },
     "ldap": {
       "ipv4": "172.23.75.3/32",
       "ipv6": "2a01:4f8:210:31fd:1::3/128",
-      "group": "php",
-      "ula": "fdc0:4992:6a6d::3/128"
+      "ula": "fd42:4992:6a6d::3/128"
     },
     "web": {
       "ipv4": "172.23.75.5/32",
@@ -65,6 +69,8 @@
         },
         "git": {
           "usr/share/webapps/gitlab/public": true,
+          "var/lib/gitlab/assets": true,
+          "var/lib/gitlab/uploads": true,
           "srv/http/higgsboson.tk": true,
           "srv/http/blog.higgsboson.tk": true
         },
@@ -80,9 +86,6 @@
         "rainloop": {
           "srv/http/mail.higgsboson.tk": true
         },
-        "limesurvey": {
-          "usr/share/webapps/limesurvey": true
-        },
         "etherpad": {
           "/usr/share/webapps/etherpad-lite/src/static": "/srv/http/pad.higgsboson.tk/static"
         },
@@ -118,51 +121,36 @@
           "var/lib/tt-rss/feed-icons": true
         }
       },
-      "ula": "fdc0:4992:6a6d::5/128"
-    },
-    "ns1.evenet.dn42": {
-      "ns": true,
-      "lxc": false,
-      "ipv4": "172.23.75.6",
-      "ipv6": "fdc0:4992:6a6d::6"
-    },
-    "ns2.evenet.dn42": {
-      "ns": true,
-      "lxc": false,
-      "ipv4": "172.23.75.70",
-      "ipv6": "fdc0:4992:6a6d:300::6"
+      "ula": "fd42:4992:6a6d::5/128"
     },
     "dns": {
       "ipv4": "172.23.75.6/32",
       "ipv6": "2a01:4f8:210:31fd:1::6/128",
       "rdns6": "ns1.higgsboson.tk",
-      "ula": "fdc0:4992:6a6d::6/128"
+      "ula": "fd42:4992:6a6d::6/128"
     },
     "dn42": {
       "ipv4": "172.23.75.1/32",
       "ipv6": "2a01:4f8:210:31fd:1::1/128",
-      "ula": "fdc0:4992:6a6d::1/128",
+      "ula": "fd42:4992:6a6d::1/128",
       "mounts": {
         "web": {
           "srv/http/dl.higgsboson.tk": true
+        },
+        "dns": {
+          "etc/named/net.dn42.registry": "etc/bird/registry"
         }
       }
     },
-    "dn42-2": {
-      "ipv4": "172.23.75.65/32",
-      "ipv6": "2a03:b0c0:0:1010::3d:b001",
-      "ula": "fdc0:4992:6a6d:300::1",
-      "lxc": false
-    },
     "faces": {
       "ipv4": "172.23.75.7/32",
       "ipv6": "2a01:4f8:210:31fd:1::7/128",
-      "ula": "fdc0:4992:6a6d::7/128"
+      "ula": "fd42:4992:6a6d::7/128"
     },
     "jtes": {
       "ipv4": "172.23.75.8/32",
       "ipv6": "2a01:4f8:210:31fd:1::8/128",
-      "ula": "fdc0:4992:6a6d::8/128"
+      "ula": "fd42:4992:6a6d::8/128"
     },
     "mysql": {
       "ipv4": "172.23.75.9/32",
@@ -173,7 +161,7 @@
           "command": "backup-mysql"
         }
       ],
-      "ula": "fdc0:4992:6a6d::9/128"
+      "ula": "fd42:4992:6a6d::9/128"
     },
     "gitweb": {
       "cname": "web",
@@ -183,7 +171,7 @@
       "ipv4": "172.23.75.4/32",
       "rdns6": "git.higgsboson.tk",
       "ipv6": "2a01:4f8:210:31fd:1::4/128",
-      "ula": "fdc0:4992:6a6d::4/128"
+      "ula": "fd42:4992:6a6d::4/128"
     },
     "postgres": {
       "ipv4": "172.23.75.10/32",
@@ -194,45 +182,13 @@
           "command": "backup-postgres"
         }
       ],
-      "ula": "fdc0:4992:6a6d::a/128"
-    },
-    "phpmyadmin": {
-      "ipv4": "172.23.75.11/32",
-      "ipv6": "2a01:4f8:210:31fd:1::b/128",
-      "ula": "fdc0:4992:6a6d::b/128",
-      "group": "php",
-      "vars": {
-        "php_extensions": [
-          "mysql",
-          "pdo_mysql"
-        ]
-      }
-    },
-    "phppgadmin": {
-      "ipv4": "172.23.75.13/32",
-      "ipv6": "2a01:4f8:210:31fd:1::d/128",
-      "ula": "fdc0:4992:6a6d::d/128",
-      "group": "php",
-      "vars": {
-        "php_extensions": [
-          "pgsql",
-          "pdo_pgsql"
-        ]
-      }
+      "ula": "fd42:4992:6a6d::a/128"
     },
     "adminer": {
       "ipv4": "172.23.75.14/32",
       "ipv6": "2a01:4f8:210:31fd:1::e/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "mysql",
-          "pdo_mysql",
-          "pgsql",
-          "pdo_pgsql"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::e/128"
+      "ula": "fd42:4992:6a6d::e/128"
     },
     "mail": {
       "ipv4": "172.23.75.16/32",
@@ -247,97 +203,42 @@
       "backup-paths": [
         "var/vmail"
       ],
-      "ula": "fdc0:4992:6a6d::10/128"
+      "ula": "fd42:4992:6a6d::10/128"
     },
     "istwiki": {
       "ipv4": "172.23.75.17/32",
       "ipv6": "2a01:4f8:210:31fd:1::11/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "mysql",
-          "pdo_mysql"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::11/128"
+      "ula": "fd42:4992:6a6d::11/128"
     },
     "ytm": {
       "ipv4": "172.23.75.18/32",
       "ipv6": "2a01:4f8:210:31fd:1::12/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "mysql",
-          "mysqli",
-          "pdo_mysql"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::12/128"
+      "ula": "fd42:4992:6a6d::12/128"
     },
     "ldapadmin": {
       "ipv4": "172.23.75.12/32",
       "ipv6": "2a01:4f8:210:31fd:1::c/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "ldap"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::c/128"
+      "ula": "fd42:4992:6a6d::c/128"
     },
     "rainloop": {
       "ipv4": "172.23.75.19/32",
       "ipv6": "2a01:4f8:210:31fd:1::13/128",
-      "group": "php",
-      "vars": {
-        "php_extensions": [
-          "pgsql",
-          "pdo_pgsql",
-          "openssl"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::13/128"
+      "ula": "fd42:4992:6a6d::13/128"
     },
     "owncloud": {
       "ipv4": "172.23.75.15/32",
       "ipv6": "2a01:4f8:210:31fd:1::f/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "pgsql",
-          "pdo_pgsql",
-          "gd",
-          "iconv",
-          "xmlrpc",
-          "zip",
-          "bz2",
-          "intl",
-          "mcrypt",
-          "openssl",
-          "ldap",
-          "apcu",
-          "exif",
-          "imagick"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::f/128"
+      "ula": "fd42:4992:6a6d::f/128"
     },
     "ttrss": {
       "ipv4": "172.23.75.20/32",
       "ipv6": "2a01:4f8:210:31fd:1::14/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "pgsql",
-          "pdo_pgsql",
-          "posix",
-          "iconv",
-          "soap",
-          "ldap",
-          "mcrypt"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::14/128"
+      "ula": "fd42:4992:6a6d::14/128"
     },
     "teamspeak": {
       "ipv4": "172.23.75.21/32",
@@ -345,7 +246,7 @@
       "backup-paths": [
         "var/lib/teamspeak3-server"
       ],
-      "ula": "fdc0:4992:6a6d::15/128"
+      "ula": "fd42:4992:6a6d::15/128"
     },
     "prosody": {
       "ipv4": "172.23.75.22/32",
@@ -360,56 +261,39 @@
           "/etc/letsencrypt/archive/": true
         }
       },
-      "ula": "fdc0:4992:6a6d::16/128"
+      "ula": "fd42:4992:6a6d::16/128"
     },
     "piwik": {
       "ipv4": "172.23.75.23/32",
       "ipv6": "2a01:4f8:210:31fd:1::17/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "mysql",
-          "mysqli",
-          "pdo_mysql",
-          "gd",
-          "iconv"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::17/128"
+      "ula": "fd42:4992:6a6d::17/128"
     },
     "tweetnest": {
       "ipv4": "172.23.75.24/32",
       "ipv6": "2a01:4f8:210:31fd:1::18/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-          "mysql",
-          "mysqli",
-          "pdo_mysql",
-          "curl"
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::18/128"
+      "ula": "fd42:4992:6a6d::18/128"
     },
     "etherpad": {
       "ipv4": "172.23.75.25/32",
       "ipv6": "2a01:4f8:210:31fd:1::19/128",
-      "ula": "fdc0:4992:6a6d::19/128"
+      "ula": "fd42:4992:6a6d::19/128"
     },
     "pyload": {
       "ipv4": "172.23.75.26/32",
       "ipv6": "2a01:4f8:210:31fd:1::1a/128",
-      "ula": "fdc0:4992:6a6d::1a/128"
+      "ula": "fd42:4992:6a6d::1a/128"
     },
     "squid": {
       "ipv4": "172.23.75.27/32",
       "ipv6": "2a01:4f8:210:31fd:1::1b/128",
-      "ula": "fdc0:4992:6a6d::1b/128"
+      "ula": "fd42:4992:6a6d::1b/128"
     },
     "seafile": {
       "ipv4": "172.23.75.29/32",
       "ipv6": "2a01:4f8:210:31fd:1::1d/128",
-      "ula": "fdc0:4992:6a6d::1d/128"
+      "ula": "fd42:4992:6a6d::1d/128"
     },
     "login": {
       "ipv4": "172.23.75.30/32",
@@ -432,60 +316,44 @@
           }
         ]
       },
-      "ula": "fdc0:4992:6a6d::1e/128"
+      "ula": "fd42:4992:6a6d::1e/128"
     },
     "halfcode": {
       "ipv4": "172.23.75.32/32",
       "ipv6": "2a01:4f8:210:31fd:1::20/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::20/128"
+      "ula": "fd42:4992:6a6d::20/128"
     },
     "phonefinder": {
       "ipv4": "172.23.75.33/32",
       "ipv6": "2a01:4f8:210:31fd:1::21/128",
       "group": "php",
-      "vars": {
-        "php_extensions": [
-
-        ]
-      },
-      "ula": "fdc0:4992:6a6d::21/128"
+      "ula": "fd42:4992:6a6d::21/128"
     },
     "terraria": {
       "ipv4": "172.23.75.34/32",
       "ipv6": "2a01:4f8:210:31fd:1::22/128",
-      "ula": "fdc0:4992:6a6d::22/128"
+      "ula": "fd42:4992:6a6d::22/128"
     },
     "ghost": {
       "ipv4": "172.23.75.35/32",
       "ipv6": "2a01:4f8:210:31fd:1::23/128",
-      "ula": "fdc0:4992:6a6d::23/128"
+      "ula": "fd42:4992:6a6d::23/128"
     },
     "bitlbee": {
       "ipv4": "172.23.75.36/32",
       "ipv6": "2a01:4f8:210:31fd:1::24/128",
-      "ula": "fdc0:4992:6a6d::24/128"
+      "ula": "fd42:4992:6a6d::24/128"
     },
     "parkendd": {
       "ipv4": "172.23.75.37/32",
       "ipv6": "2a01:4f8:210:31fd:1::25/128",
-      "ula": "fdc0:4992:6a6d::25/128"
-    },
-    "honeypot": {
-      "ipv4": "172.23.75.38/32",
-      "ipv6": "2a01:4f8:210:31fd:1::26/128",
-      "ula": "fdc0:4992:6a6d::26/128",
-      "lxc": false
+      "ula": "fd42:4992:6a6d::25/128"
     },
     "btsync": {
       "ipv4": "172.23.75.31/32",
       "ipv6": "2a01:4f8:210:31fd:1::1f/128",
-      "ula": "fdc0:4992:6a6d::1f/128",
+      "ula": "fd42:4992:6a6d::1f/128",
       "mounts": {
         "pyload": {
           "var/lib/pyload/Downloads": "mnt/pyload"
@@ -495,23 +363,17 @@
     "letsencrypt": {
       "ipv4": "172.23.75.28/32",
       "ipv6": "2a01:4f8:210:31fd:1::1c/128",
-      "ula": "fdc0:4992:6a6d::1c/128"
+      "ula": "fd42:4992:6a6d::1c/128"
     },
-    "limesurvey": {
-      "ipv4": "172.23.75.39/32",
-      "ipv6": "2a01:4f8:210:31fd:1::27/128",
-      "ula": "fdc0:4992:6a6d::27/128",
-      "group": "php",
-      "vars": {
-        "php_extensions": [
-          "pgsql",
-          "pdo_pgsql",
-          "gd",
-          "zip",
-          "ldap",
-          "imap"
-        ]
-      }
+    "sabredav": {
+      "ipv4": "172.23.75.11/32",
+      "ipv6": "2a01:4f8:210:31fd:1::b/128",
+      "ula": "fd42:4992:6a6d::b/128"
+    },
+    "dn42wiki": {
+      "ipv4": "172.23.75.13/32",
+      "ipv6": "2a01:4f8:210:31fd:1::d/128",
+      "ula": "fd42:4992:6a6d::d/128"
     }
   }
-}
+}
\ No newline at end of file