Merge pull request #27 from pesco/master

stubnitz-gw und stubnitz-museum (ost) hinzugefuegt

README.md

@@ -1,12 +1,21 @@
-Statische IPv4-Vergabe im FFHH-DHCP
+Statische IPv4-Vergabe
 ===================================
 
-[Subnetze](http://wiki.freifunk.net/Freifunk_Hamburg/%C3%9Cber#Subnetze)
+Folgende Netze werden in den einzelnen Domänen des Hamburger Freifunknetzes genutzt:
 
-*Statische IPs muessen im Netz 10.112.0.0/21 sein!*
+- Süd (sued)        10.112.64.0/19
-*Die 10.112.0.1 ist für node.ffhh reserviert*
+- West (west)       10.112.96.0/19
+- Nordwest (nowe)   10.112.192.0/19
+- Ost (ost)         10.112.224.0/19
 
-Bitte Pull-Requests schicken!
+Statische IPs müssen in folgenden Bereichen sein sein:
+
+- Süd (sued)        10.112.64.2 bis 10.112.64.200
+- West (west)       10.112.96.2 bis 10.112.96.200
+- Nordwest (nowe)   10.112.192.2 bis 10.112.192.200
+- Ost (ost)         10.112.224.2 bis 10.112.224.200
+
+Bitte Pull-Requests anlegen!
 -----------------------------
 
-Wenn ihr auch statische IPs an eure MAC gebunden haben wollt, macht einen fork, fuegt euch in die static.conf hinzu (nach IP sortiert!) und macht einen pull-request.
+Wenn ihr eine statische IP an eure MAC gebunden haben wollt, macht einen Fork, fügt einen entsprechenden Eintrag in der passenden .json-Datei ein (nach IP sortiert!) und erstellt einen Pull-Request.

static-nowe.json

@@ -0,0 +1,2 @@
+"reservations": [
+]

static-ost.json

@@ -0,0 +1,12 @@
+"reservations": [
+    {
+        "hw-address": "00:0d:b9:50:5b:4f",
+        "ip-address": "10.112.224.2",
+        "hostname": "stubnitz-gw"
+    },
+    {
+        "hw-address": "6a:65:4f:dc:86:c9",
+        "ip-address": "10.112.224.3",
+        "hostname": "stubnitz-museum"
+    }
+]

static-sued.json

@@ -0,0 +1,72 @@
+"reservations": [
+    {
+        "hw-address": "b8:27:eb:0c:5d:29",
+        "ip-address": "10.112.64.2",
+        "hostname": "Martin-Sued1"
+    },
+    {
+        "hw-address": "b8:27:eb:59:08:7c",
+        "ip-address": "10.112.64.3",
+        "hostname": "Martin-Sued2"
+    },
+    {
+        "hw-address": "00:90:f5:c9:6b:4a",
+        "ip-address": "10.112.64.4",
+        "hostname": "Martin-Sued3"
+    },
+    {
+        "hw-address": "ac:72:89:ac:dc:44",
+        "ip-address": "10.112.64.5",
+        "hostname": "Martin-Sued4"
+    },
+    {
+      "hw-address": "44:D9:E7:78:83:ED",
+      "ip-address": "10.112.64.6",
+      "hostname": "AschenlandRF1"
+    },
+    {
+       "hw-address": "44:D9:E7:78:84:86",
+       "ip-address": "10.112.64.7",
+       "hostname": "AschenlandRF2"
+    },
+    {
+       "hw-address": "44:D9:E7:51:48:CB",
+       "ip-address": "10.112.64.8",
+       "hostname": "AschenlandSW"
+    },
+    {
+       "hw-address": "60:E3:27:72:41:92",
+       "ip-address": "10.112.64.9",
+       "hostname": "AschenlandCPE51"
+    },
+    {
+       "hw-address": "60:E3:27:72:47:9A",
+       "ip-address": "10.112.64.10",
+       "hostname": "AschenlandCPE52"
+    },
+    {
+       "hw-address": "E0:63:DA:14:CF:3E",
+       "ip-address": "10.112.64.11",
+       "hostname": "Neuenfelde-Client-0"
+    },
+    {
+       "hw-address": "E0:63:DA:14:D1:FB",
+       "ip-address": "10.112.64.12",
+       "hostname": "Neuenfelde-Client-1"
+    },
+    {
+       "hw-address": "74:83:C2:90:C3:CD",
+       "ip-address": "10.112.64.13",
+       "hostname": "Neuenfelde-Client-2"
+    },
+    {
+       "hw-address": "E0:63:DA:14:D0:6E",
+       "ip-address": "10.112.64.14",
+       "hostname": "Neuenfelde-Client-3"
+    },
+    {
+       "hw-address": "E0:63:DA:14:D1:0F",
+       "ip-address": "10.112.64.15",
+       "hostname": "Neuenfelde-Uplink"
+    }
+]

static-west.json

@@ -0,0 +1,67 @@
+"reservations": [
+    {
+        "hw-address": "2C:BE:97:00:A4:CD",
+        "ip-address": "10.112.96.2",
+        "hostname": "bb-gleis4a-solar"
+    },
+    {
+        "hw-address": "00:e0:4c:36:56:e6",
+        "ip-address": "10.112.96.3",
+        "hostname": "plateau"
+    },
+    {
+        "hw-address": "80:1f:02:f7:0d:f9",
+        "ip-address": "10.112.96.4",
+        "hostname": "girl"
+    },
+    {
+        "hw-address": "C4:E9:84:99:A4:2E",
+        "ip-address": "10.112.96.5",
+        "hostname": "bb-werkhof-00-cpe5"
+    },
+    {
+        "hw-address": "C4:E9:84:99:9E:B4",
+        "ip-address": "10.112.96.6",
+        "hostname": "bb-werkhof-18-cpe5"
+    },
+    {
+        "hw-address": "24:A4:3C:E6:74:7A",
+        "ip-address": "10.112.96.10",
+        "hostname": "altona-nano-m5"
+    },
+    {
+        "hw-address": "b8:27:eb:23:fc:9b",
+        "ip-address": "10.112.96.11",
+        "hostname": "freipi"
+    },
+    {
+        "hw-address": "00:1F:1F:6C:11:18",
+        "ip-address": "10.112.96.12",
+        "hostname": "igelcam"
+    },
+    {
+        "hw-address": "B8:27:EB:38:54:E9",
+        "ip-address": "10.112.96.13",
+        "hostname": "brachvogel"
+    },
+    {
+        "hw-address": "00:24:21:2e:63:f9",
+        "ip-address": "10.112.96.21",
+        "hostname": "cloud"
+    },
+    {
+        "hw-address": "70:85:c2:23:d4:ae",
+        "ip-address": "10.112.96.23",
+        "hostname": "speicher"
+    },
+    {
+        "hw-address": "e4:95:6e:45:6a:04",
+        "ip-address": "10.112.96.25",
+        "hostname": "hoerstation1"
+    },
+    {
+        "hw-address": "e4:95:6e:45:6a:97",
+        "ip-address": "10.112.96.26",
+        "hostname": "hoerstation2"
+    }
+]

static.conf

@@ -3,14 +3,10 @@ host funkstueck {
 	fixed-address 10.112.0.2;
 }
 
-host plateau {
-	hardware ethernet b8:27:eb:f0:e1:f8;
-	fixed-address 10.112.0.3;
-}
 
-host plateau-beamer {
+host julez {
-	hardware ethernet 80:1f:02:f7:0d:f9;
+	hardware ethernet 00:87:33:47:0e:c4;
-	fixed-address 10.112.0.4;
+	fixed-address 10.112.0.5;
 }
 
 host freipei {
@@ -18,31 +14,6 @@ host freipei {
         fixed-address 10.112.0.9;
 }
 
-host altona-nano-m5 {
-        hardware ethernet 24:A4:3C:E6:74:7A;
-        fixed-address 10.112.0.10;
-}
-
-host freipi {
-        hardware ethernet b8:27:eb:23:fc:9b; 
-        fixed-address 10.112.0.11;
-}
-
-host igelcam {
-	hardware ethernet 00:1F:1F:6C:11:18;
-	fixed-address 10.112.0.12;
-}
-
-host brachvogel {
-	hardware ethernet B8:27:EB:38:54:E9;
-	fixed-address 10.112.0.13;
-}
-
-host herbrich {
-	hardware ethernet b8:27:eb:f6:53:c0;
-	fixed-address 10.112.0.14;
-}
-
 host monitoring1 {
 	hardware ethernet 52:54:00:91:b0:13;
 	fixed-address 10.112.0.15;
@@ -53,21 +24,11 @@ host testsessel {
 	fixed-address 10.112.0.20;
 }
 
-host cloud {
-	hardware ethernet 00:24:21:2e:63:f9;
-	fixed-address 10.112.0.21;
-}
-
 host lenny {
 	hardware ethernet 8c:70:5a:e3:9e:08;
 	fixed-address 10.112.0.22;
 }
 
-host apuschnacke {
-	hardware ethernet 00:0d:b9:3f:7b:f6;
-	fixed-address 10.112.0.24;
-}
-
 host gitlab {
 	hardware ethernet 52:54:00:7d:4e:17;
 	fixed-address 10.112.0.28;
@@ -118,11 +79,86 @@ host curslack1-nw {
 	fixed-address 10.112.0.37;
 }
 
+host weidenbaum-AP1 {
+	hardware ethernet 60:e3:27:9f:59:26;
+	fixed-address 10.112.0.38;
+}
+
+host weidenbaum-AP2 {
+	hardware ethernet 60:e3:27:9f:4f:8a;
+	fixed-address 10.112.0.39;
+}
+
+host weidenbaum-AP3 {
+	hardware ethernet 60:e3:27:9f:50:9a;
+	fixed-address 10.112.0.40;
+}
+
+host WR1043-AP1 {
+	hardware ethernet 30:b5:c2:6f:0f:e2;
+	fixed-address 10.112.0.41;
+}
+
 host frutro {
     hardware ethernet 00:19:99:dd:49:c8;
     fixed-address 10.112.0.42;
 }
 
+host WR840-AP1 {
+	hardware ethernet a4:2b:b0:eb:01:4a;
+	fixed-address 10.112.0.43;
+}
+
+host WR840-AP2 {
+	hardware ethernet a4:2b:b0:eb:01:3c;
+	fixed-address 10.112.0.44;
+}
+
+host WR840-AP3 {
+	hardware ethernet a4:2b:b0:c1:2c:b4;
+	fixed-address 10.112.0.45;
+}
+
+host WR840-AP4 {
+	hardware ethernet a4:2b:b0:eb:0f:36;
+	fixed-address 10.112.0.46;
+}
+
+host WR840-AP5 {
+	hardware ethernet a4:2b:b0:eb:00:b4;
+	fixed-address 10.112.0.47;
+}
+
+host WR840-AP6 {
+	hardware ethernet a4:2b:b0:eb:00:b6;
+	fixed-address 10.112.0.48;
+}
+
+host WA701-AP1 {
+	hardware ethernet 60:e3:27:d1:60:e1;
+	fixed-address 10.112.0.49;
+}
+
+host WA701-AP2 {
+	hardware ethernet 60:e3:27:d1:61:44;
+	fixed-address 10.112.0.50;
+}
+
+host WR1043-AP2 {
+	hardware ethernet c4:6e:1f:40:f5:be;
+	fixed-address 10.112.0.51;
+}
+
+host WR1043-AP3 {
+	hardware ethernet 14:cc:20:b9:a3:80;
+	fixed-address 10.112.0.52;
+}
+
+host lora-hhsued {
+	hardware ethernet b8:27:eb:f2:27:ef;
+	fixed-address 10.112.0.53;
+}
+
 host srv01.hamburg.freifunk.net {
         hardware ethernet de:ad:be:ef:08:15;
         fixed-address 10.112.1.1;
@@ -137,102 +173,8 @@ host srv02.hamburg.freifunk.net {
 
 
 #10.112.62.1 - 10.112.63.254 für Richtfunkstrecken
-host bb-esmarch95-35-nsm5 {
-        hardware ethernet 04:18:D6:2C:4A:8A;
-        fixed-address 10.112.62.1;
-}
 
-host bb-fux-12-nsm5 {
+host fux-archer-c2-temp {
-        hardware ethernet 04:18:D6:2C:4A:B4;
+        hardware ethernet E8:DE:27:F5:6D:A8;
-        fixed-address 10.112.62.2;
+        fixed-address 10.112.62.23;
-}
-
-host bb-esmarch95-13-nsm5 {
-        hardware ethernet 04:18:D6:2C:4C:FF;
-        fixed-address 10.112.62.3;
-}
-
-host bb-esmarch95-19-nsm5 {
-        hardware ethernet 04:18:D6:2C:49:08;
-        fixed-address 10.112.62.4;
-}
-
-host bb-esmarch95-22-nsm5 {
-        hardware ethernet 24:A4:3C:E6:72:7E;
-        fixed-address 10.112.62.5;
-}
-
-host bb-fux-28-nsm5 {
-        hardware ethernet 04:18:D6:2C:4E:09;
-        fixed-address 10.112.62.6;
-}
-
-host bb-fux-01-nsm5 {
-        hardware ethernet 04:18:D6:44:E2:30;
-        fixed-address 10.112.62.7;
-}
-
-host bb-fux-17-nsm5 {
-        hardware ethernet 04:18:D6:44:E3:DF;
-        fixed-address 10.112.62.8;
-}
-
-host bb-flora-12-nsm5 {
-        hardware ethernet 04:18:D6:26:FC:79;
-        fixed-address 10.112.62.9;
-}
-
-host bb-flora-35-nsm5 {
-        hardware ethernet 04:18:D6:0C:C9:D1;
-        fixed-address 10.112.62.10;
-}
-
-host bb-werkhof-0-cpe5 {
-        hardware ethernet C4:E9:84:99:A4:2E;
-        fixed-address 10.112.62.11;
-}
-
-host bb-werkhof-18-cpe5 {
-        hardware ethernet C4:E9:84:99:9E:B4;
-        fixed-address 10.112.62.12;
-}
-
-host fux-mw-1g-buero {
-        hardware ethernet A0:F3:C1:48:D7:C4;
-        fixed-address 10.112.62.13;
-}
-
-host fux-fraplap {
-        hardware ethernet C4:6E:1F:B6:5B:B2;
-        fixed-address 10.112.62.14;
-}
-
-host fux-mw-3g-tanz {
-        hardware ethernet E8:94:F6:68:2B:F6;
-        fixed-address 10.112.62.15;
-}
-
-host fux-w-3g-buero-alt {
-        hardware ethernet 14:CC:20:C0:2F:0C;
-        fixed-address 10.112.62.16;
-}
-
-host fux-w-2g {
-        hardware ethernet F4:F2:6D:40:44:16;
-        fixed-address 10.112.62.17;
-}
-
-host fux_MW_1G_03 {
-        hardware ethernet 64:70:02:f1:e5:24;
-        fixed-address 10.112.62.18;
-}
-
-host fux_MW_1G_04 {
-        hardware ethernet 64:70:02:be:49:38;
-        fixed-address 10.112.62.19;
-}
-
-host fux_gaengeviertel {
-        hardware ethernet e8:94:f6:4f:b2:1c;
-        fixed-address 10.112.62.20;
 }