From 44979e65190036d8960e78e20eaff8025b2aaa90 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 27 Nov 2018 23:33:12 +0100
Subject: [PATCH] move priv19 to larger subnet

---
 salt-pillar/dhcp/init.sls    | 7 ++++---
 salt-pillar/hosts/init.sls   | 7 ++++---
 salt-pillar/subnets/init.sls | 3 ++-
 subnets.md                   | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index aabb7fc..6bc0e99 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -241,10 +241,11 @@ dhcp:
       domain-name: priv18.zentralwerk.org
 
   priv19:
-    start: 172.20.74.82
-    end: 172.20.74.94
+    start: 172.20.73.194
+    end: 172.20.73.254
     time: 120
-    max-time: 86400
+    # 30 days
+    max-time: 2592000
     opts:
     host-opts:
       routers: priv19-gw.priv19
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 7ce7ac9..aebd1ee 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -113,6 +113,7 @@ hosts-inet:
     priv22-gw: 172.20.72.35
     priv23-gw: 172.20.72.36
     priv24-gw: 172.20.72.37
+    priv25-gw: 172.20.72.32
 
   pub:
     pub-gw: 172.20.76.1
@@ -219,9 +220,9 @@ hosts-inet:
     dhcp{{ i }}: 172.20.74.{{ 49 + i }}
 {%- endfor %}
   priv19:
-    priv19-gw: 172.20.74.81
-{%- for i in range(1, 14) %}
-    dhcp{{ i }}: 172.20.74.{{ 81 + i }}
+    priv19-gw: 172.20.73.193
+{%- for i in range(1, 61) %}
+    dhcp{{ i }}: 172.20.74.{{ 193 + i }}
 {%- endfor %}
   priv20:
     priv20-gw: 172.20.74.113
diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls
index e2fb679..c6d3fa4 100644
--- a/salt-pillar/subnets/init.sls
+++ b/salt-pillar/subnets/init.sls
@@ -2,12 +2,13 @@ subnets-inet:
   core: 172.20.72.0/26
   serv: 172.20.73.0/26
   pub: 172.20.76.0/22
+  priv19: 172.20.73.192/26
   priv1: 172.20.74.0/28
   priv17: 172.20.74.16/28
   priv9: 172.20.74.32/28
   priv18: 172.20.74.48/28
   priv5: 172.20.74.64/28
-  priv19: 172.20.74.80/28
+  priv25: 172.20.74.80/28
   priv10: 172.20.74.96/28
   priv20: 172.20.74.112/28
   priv3: 172.20.74.128/28
diff --git a/subnets.md b/subnets.md
index 0d230a8..58b1038 100644
--- a/subnets.md
+++ b/subnets.md
@@ -8,14 +8,14 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 * 172.20.73.0-172.20.73.63/26 SERVERS
 * 172.20.73.64/26 RESERVED FOR EXPANDING SERVERS
 * 172.20.73.128/26 COLORADIO
-* 172.20.73.192/26
+* 172.20.73.192/26 PRIV19
 * 172.20.74.0/24:
   * 172.20.74.0/28 PRIV1
   * 172.20.74.16/28 PRIV17
   * 172.20.74.32/28 PRIV9
   * 172.20.74.48/28 PRIV18
   * 172.20.74.64/28 PRIV5
-  * 172.20.74.80/28 PRIV19
+  * 172.20.74.80/28 PRIV25
   * 172.20.74.96/28 PRIV10
   * 172.20.74.112/28 PRIV20
   * 172.20.74.128/28 PRIV3