From 1a25dc568f12731751b68a695634dd20ee3cb7de Mon Sep 17 00:00:00 2001 From: Dirk Date: Sat, 20 Aug 2016 14:09:21 +0200 Subject: [PATCH 01/31] Update static.conf WR840-AP5 double removed --- static.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static.conf b/static.conf index 6d4b2be..e171157 100644 --- a/static.conf +++ b/static.conf @@ -168,7 +168,7 @@ host WR840-AP5 { fixed-address 10.112.0.47; } -host WR840-AP5 { +host WR840-AP6 { hardware ethernet a4:2b:b0:eb:00:b6; fixed-address 10.112.0.48; } From 8e6368e6d8033f83b2b0f25c4229b380713520fe Mon Sep 17 00:00:00 2001 From: Leo Krueger Date: Sat, 20 Aug 2016 14:28:27 +0200 Subject: [PATCH 02/31] Revert "Revert "Update static.conf"" --- static.conf | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/static.conf b/static.conf index 00eb6df..6d4b2be 100644 --- a/static.conf +++ b/static.conf @@ -118,11 +118,81 @@ 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-AP5 { + 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 srv01.hamburg.freifunk.net { hardware ethernet de:ad:be:ef:08:15; fixed-address 10.112.1.1; From df2ab4c9a45c426f27bd306867b234b18024fc6c Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 21 Aug 2016 10:00:14 +0200 Subject: [PATCH 03/31] =?UTF-8?q?MAC=20von=20plateau-beamer=20ge=C3=A4nder?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static.conf b/static.conf index e171157..105b1cb 100644 --- a/static.conf +++ b/static.conf @@ -4,7 +4,7 @@ host funkstueck { } host plateau { - hardware ethernet b8:27:eb:f0:e1:f8; + hardware ethernet 00:e0:4c:36:56:e6; fixed-address 10.112.0.3; } From a4f36075d19b6f507776aef00b15984a9f34f91c Mon Sep 17 00:00:00 2001 From: DrGenscher Date: Sun, 21 Aug 2016 14:41:10 +0200 Subject: [PATCH 04/31] 0.4 / 0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0.4 geändert 0.5 hinzugefügt --- static.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/static.conf b/static.conf index 105b1cb..f30c1eb 100644 --- a/static.conf +++ b/static.conf @@ -8,11 +8,16 @@ host plateau { fixed-address 10.112.0.3; } -host plateau-beamer { +host girl { hardware ethernet 80:1f:02:f7:0d:f9; fixed-address 10.112.0.4; } +host julez { + hardware ethernet 00:87:33:47:0e:c4; + fixed-address 10.112.0.5; +} + host freipei { hardware ethernet b8:27:eb:3d:a4:b5; fixed-address 10.112.0.9; From 4425bdb6234e43395341e17920c6402f18a8de93 Mon Sep 17 00:00:00 2001 From: 4ndr3 Date: Mon, 28 Nov 2016 20:47:13 +0100 Subject: [PATCH 05/31] =?UTF-8?q?bb-pgkaltona-00-nsm5=20&=20bb-pgkaltona-0?= =?UTF-8?q?9-nsm5=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/static.conf b/static.conf index f30c1eb..76c56e7 100644 --- a/static.conf +++ b/static.conf @@ -311,3 +311,13 @@ host fux_gaengeviertel { hardware ethernet e8:94:f6:4f:b2:1c; fixed-address 10.112.62.20; } + +host bb-pgkaltona-00-nsm5 { + hardware ethernet 80:2A:A8:72:69:BE; + fixed-address 10.112.62.21; +} + +host bb-pgkaltona-09-nsm5 { + hardware ethernet 80:2A:A8:72:6A:0D; + fixed-address 10.112.62.22; +} From d5434a6b5e813bdb807956d7a7da1fc736ac1d23 Mon Sep 17 00:00:00 2001 From: Entil-Zha Date: Mon, 30 Jan 2017 18:56:50 +0100 Subject: [PATCH 06/31] add fux-archer-c2-temp --- static.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static.conf b/static.conf index 76c56e7..ed7d840 100644 --- a/static.conf +++ b/static.conf @@ -321,3 +321,8 @@ host bb-pgkaltona-09-nsm5 { hardware ethernet 80:2A:A8:72:6A:0D; fixed-address 10.112.62.22; } + +host fux-archer-c2-temp { + hardware ethernet E8:DE:27:F5:6D:A8; + fixed-address 10.112.62.23; +} From 0755fc6dd410cf729df46e4f4c43d262dae82e99 Mon Sep 17 00:00:00 2001 From: Leo Krueger Date: Sun, 5 Feb 2017 13:01:32 +0100 Subject: [PATCH 07/31] add lora-hhsued gateway --- static.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static.conf b/static.conf index ed7d840..3fb29a8 100644 --- a/static.conf +++ b/static.conf @@ -198,6 +198,11 @@ host WR1043-AP3 { 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; From cdb98e8ef5fa2a255b9a33f9e7a5415fd46f4d37 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Thu, 23 Feb 2017 23:34:27 +0100 Subject: [PATCH 08/31] prepare for domain-split --- static-nowe.conf | 0 static-ost.conf | 0 static-sued.conf | 0 static-west.conf | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 static-nowe.conf create mode 100644 static-ost.conf create mode 100644 static-sued.conf create mode 100644 static-west.conf diff --git a/static-nowe.conf b/static-nowe.conf new file mode 100644 index 0000000..e69de29 diff --git a/static-ost.conf b/static-ost.conf new file mode 100644 index 0000000..e69de29 diff --git a/static-sued.conf b/static-sued.conf new file mode 100644 index 0000000..e69de29 diff --git a/static-west.conf b/static-west.conf new file mode 100644 index 0000000..e69de29 From 424e0fe8284d992d22956d6e8514ef02d961edd8 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 25 Jun 2017 18:47:01 +0200 Subject: [PATCH 09/31] =?UTF-8?q?aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nicht mehr existente Geräte entfernt und Namen aktualisiert --- static.conf | 54 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 52 deletions(-) diff --git a/static.conf b/static.conf index 3fb29a8..b5beba6 100644 --- a/static.conf +++ b/static.conf @@ -43,11 +43,6 @@ host brachvogel { 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; @@ -227,12 +222,7 @@ host bb-fux-12-nsm5 { fixed-address 10.112.62.2; } -host bb-esmarch95-13-nsm5 { - hardware ethernet 04:18:D6:2C:4C:FF; - fixed-address 10.112.62.3; -} - -host bb-esmarch95-19-nsm5 { +host bb-bb-flora-saal-5 { hardware ethernet 04:18:D6:2C:49:08; fixed-address 10.112.62.4; } @@ -247,7 +237,7 @@ host bb-fux-28-nsm5 { fixed-address 10.112.62.6; } -host bb-fux-01-nsm5 { +host bb-fux-23-nsm5 { hardware ethernet 04:18:D6:44:E2:30; fixed-address 10.112.62.7; } @@ -277,46 +267,6 @@ host bb-werkhof-18-cpe5 { 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; -} - host bb-pgkaltona-00-nsm5 { hardware ethernet 80:2A:A8:72:69:BE; fixed-address 10.112.62.21; From da1d3f6215933e4e81a196f50f7cd07535f5f30b Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 25 Jun 2017 22:08:40 +0200 Subject: [PATCH 10/31] bb-fux-hof-1-nsm5 --- static.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static.conf b/static.conf index b5beba6..0e342a1 100644 --- a/static.conf +++ b/static.conf @@ -222,7 +222,7 @@ host bb-fux-12-nsm5 { fixed-address 10.112.62.2; } -host bb-bb-flora-saal-5 { +host bb-fux-hof-1-nsm5 { hardware ethernet 04:18:D6:2C:49:08; fixed-address 10.112.62.4; } From 117594aafb1cb9fca62ce95026d2d3668ee72ede Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 25 Jun 2017 22:59:58 +0200 Subject: [PATCH 11/31] =?UTF-8?q?bb-fux-hof-2-nsm5=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static.conf b/static.conf index 0e342a1..b833fac 100644 --- a/static.conf +++ b/static.conf @@ -222,6 +222,11 @@ host bb-fux-12-nsm5 { fixed-address 10.112.62.2; } +host bb-fux-hof-2-nsm5 { + hardware ethernet 80:2a:a8:7a:2a:c8; + fixed-address 10.112.62.3; +} + host bb-fux-hof-1-nsm5 { hardware ethernet 04:18:D6:2C:49:08; fixed-address 10.112.62.4; From b838684a9880d8b7d81c7623110d3e3adb91e811 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Mon, 4 Dec 2017 20:50:02 +0100 Subject: [PATCH 12/31] add reservation files for new domains based on kea --- static-nowe.conf | 0 static-nowe.json | 2 ++ static-ost.conf | 0 static-ost.json | 2 ++ static-sued.conf | 0 static-sued.json | 2 ++ static-west.conf | 0 static-west.json | 12 ++++++++++++ 8 files changed, 18 insertions(+) delete mode 100644 static-nowe.conf create mode 100644 static-nowe.json delete mode 100644 static-ost.conf create mode 100644 static-ost.json delete mode 100644 static-sued.conf create mode 100644 static-sued.json delete mode 100644 static-west.conf create mode 100644 static-west.json diff --git a/static-nowe.conf b/static-nowe.conf deleted file mode 100644 index e69de29..0000000 diff --git a/static-nowe.json b/static-nowe.json new file mode 100644 index 0000000..be87cd7 --- /dev/null +++ b/static-nowe.json @@ -0,0 +1,2 @@ +"reservations": [ +] \ No newline at end of file diff --git a/static-ost.conf b/static-ost.conf deleted file mode 100644 index e69de29..0000000 diff --git a/static-ost.json b/static-ost.json new file mode 100644 index 0000000..be87cd7 --- /dev/null +++ b/static-ost.json @@ -0,0 +1,2 @@ +"reservations": [ +] \ No newline at end of file diff --git a/static-sued.conf b/static-sued.conf deleted file mode 100644 index e69de29..0000000 diff --git a/static-sued.json b/static-sued.json new file mode 100644 index 0000000..be87cd7 --- /dev/null +++ b/static-sued.json @@ -0,0 +1,2 @@ +"reservations": [ +] \ No newline at end of file diff --git a/static-west.conf b/static-west.conf deleted file mode 100644 index e69de29..0000000 diff --git a/static-west.json b/static-west.json new file mode 100644 index 0000000..1fa1481 --- /dev/null +++ b/static-west.json @@ -0,0 +1,12 @@ +"reservations": [ + { + "hw-address": "00:24:21:2e:63:f9", + "ip-address": "10.112.96.21", + "hostname": "cloud" + }, + { + "hw-address": "00:0d:b9:3f:7b:f6", + "ip-address": "10.112.96.24", + "hostname": "apuschnacke" + } +] \ No newline at end of file From 926499cb95f9710cc39c6ac9023c21f96c44156c Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Mon, 4 Dec 2017 21:27:50 +0100 Subject: [PATCH 13/31] =?UTF-8?q?Alte=20Eintr=C3=A4ge=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Umgezogen in die neuen Domänen oder ganz gelöscht, weil nicht mehr gebraucht. --- static.conf | 108 ---------------------------------------------------- 1 file changed, 108 deletions(-) diff --git a/static.conf b/static.conf index b833fac..592587d 100644 --- a/static.conf +++ b/static.conf @@ -3,15 +3,6 @@ host funkstueck { fixed-address 10.112.0.2; } -host plateau { - hardware ethernet 00:e0:4c:36:56:e6; - fixed-address 10.112.0.3; -} - -host girl { - hardware ethernet 80:1f:02:f7:0d:f9; - fixed-address 10.112.0.4; -} host julez { hardware ethernet 00:87:33:47:0e:c4; @@ -23,26 +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 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; @@ -212,75 +173,6 @@ 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 { - hardware ethernet 04:18:D6:2C:4A:B4; - fixed-address 10.112.62.2; -} - -host bb-fux-hof-2-nsm5 { - hardware ethernet 80:2a:a8:7a:2a:c8; - fixed-address 10.112.62.3; -} - -host bb-fux-hof-1-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-23-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 bb-pgkaltona-00-nsm5 { - hardware ethernet 80:2A:A8:72:69:BE; - fixed-address 10.112.62.21; -} - -host bb-pgkaltona-09-nsm5 { - hardware ethernet 80:2A:A8:72:6A:0D; - fixed-address 10.112.62.22; -} host fux-archer-c2-temp { hardware ethernet E8:DE:27:F5:6D:A8; From 247db4a91b8e4d4fd6772197b08fa4592ba60f71 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Mon, 4 Dec 2017 21:29:09 +0100 Subject: [PATCH 14/31] =?UTF-8?q?Neue=20Eintr=C3=A4ge=20=C3=BCbertragen=20?= =?UTF-8?q?aus=20dem=20alten=20Netz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static-west.json | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/static-west.json b/static-west.json index 1fa1481..709f1c8 100644 --- a/static-west.json +++ b/static-west.json @@ -1,4 +1,34 @@ "reservations": [ + { + "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": "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", @@ -9,4 +39,4 @@ "ip-address": "10.112.96.24", "hostname": "apuschnacke" } -] \ No newline at end of file +] From 0d713cbe19a07f1c3f054ba205c0b706066b505c Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Mon, 4 Dec 2017 21:33:02 +0100 Subject: [PATCH 15/31] =?UTF-8?q?Aktualisiert=20f=C3=BCr=20neue=20Dom?= =?UTF-8?q?=C3=A4nen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3e4973..00f5903 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,14 @@ Statische IPv4-Vergabe im FFHH-DHCP [Subnetze](http://wiki.freifunk.net/Freifunk_Hamburg/%C3%9Cber#Subnetze) -*Statische IPs muessen im Netz 10.112.0.0/21 sein!* +*Statische IPs müssen in folgenden Bereichen sein sein:* +static-sued.json zwischen 10.112.64.0/21 10.112.64.1-10.112.71.200 +static-west.json zwischen 10.112.96.0/21 10.112.96.1-10.112.103.200 +static-nowe.json zwischen 10.112.192.0/21 10.112.192.1-10.112.199.200 +static-ost.json zwischen 10.112.224.0/21 10.112.224.1-10.112.231.200 *Die 10.112.0.1 ist für node.ffhh reserviert* Bitte Pull-Requests schicken! ----------------------------- -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 auch statische IPs an eure MAC gebunden haben wollt, macht einen fork, fuegt euch in die entsprechende .json hinzu (nach IP sortiert!) und macht einen pull-request. From 6ec96d86e80011052b06bba56ecaa19a37231276 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Mon, 4 Dec 2017 21:34:10 +0100 Subject: [PATCH 16/31] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 00f5903..5dff0ce 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ Statische IPv4-Vergabe im FFHH-DHCP [Subnetze](http://wiki.freifunk.net/Freifunk_Hamburg/%C3%9Cber#Subnetze) *Statische IPs müssen in folgenden Bereichen sein sein:* -static-sued.json zwischen 10.112.64.0/21 10.112.64.1-10.112.71.200 -static-west.json zwischen 10.112.96.0/21 10.112.96.1-10.112.103.200 -static-nowe.json zwischen 10.112.192.0/21 10.112.192.1-10.112.199.200 -static-ost.json zwischen 10.112.224.0/21 10.112.224.1-10.112.231.200 +- static-sued.json zwischen 10.112.64.0/21 10.112.64.1-10.112.71.200 +- static-west.json zwischen 10.112.96.0/21 10.112.96.1-10.112.103.200 +- static-nowe.json zwischen 10.112.192.0/21 10.112.192.1-10.112.199.200 +- static-ost.json zwischen 10.112.224.0/21 10.112.224.1-10.112.231.200 *Die 10.112.0.1 ist für node.ffhh reserviert* Bitte Pull-Requests schicken! From 29ac7b0c4fa3a605825d1d844e85c4cfeb374b29 Mon Sep 17 00:00:00 2001 From: Leo Krueger Date: Thu, 7 Dec 2017 17:09:00 +0100 Subject: [PATCH 17/31] Update README.md --- README.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5dff0ce..99ed524 100644 --- a/README.md +++ b/README.md @@ -1,16 +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 müssen in folgenden Bereichen sein sein:* -- static-sued.json zwischen 10.112.64.0/21 10.112.64.1-10.112.71.200 -- static-west.json zwischen 10.112.96.0/21 10.112.96.1-10.112.103.200 -- static-nowe.json zwischen 10.112.192.0/21 10.112.192.1-10.112.199.200 -- static-ost.json zwischen 10.112.224.0/21 10.112.224.1-10.112.231.200 -*Die 10.112.0.1 ist für node.ffhh reserviert* +- Süd (sued) 10.112.64.0/19 +- 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 entsprechende .json 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. From dd465bc015b04f32067b975c5e8b5afbefdc09d6 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Fri, 8 Dec 2017 22:29:56 +0100 Subject: [PATCH 18/31] =?UTF-8?q?bb-werkhof-00-cpe5=20&=20bb-werkhof-18-cp?= =?UTF-8?q?e5=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static-west.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/static-west.json b/static-west.json index 709f1c8..fde16e5 100644 --- a/static-west.json +++ b/static-west.json @@ -9,6 +9,16 @@ "ip-address": "10.112.96.4", "hostname": "girl" }, + { + "hw-address": "C4:E9:84:99:A4:2E", + "ip-address": "10.112.96.4", + "hostname": "bb-werkhof-00-cpe5" + }, + { + "hw-address": "C4:E9:84:99:9E:B4", + "ip-address": "10.112.96.4", + "hostname": "bb-werkhof-18-cpe5" + }, { "hw-address": "24:A4:3C:E6:74:7A", "ip-address": "10.112.96.10", From 60245c7a90ec9f17aa43fd4aa82f506502e67c93 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Fri, 8 Dec 2017 22:36:08 +0100 Subject: [PATCH 19/31] copy/paste fehler in ip korrigiert --- static-west.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static-west.json b/static-west.json index fde16e5..79b9af1 100644 --- a/static-west.json +++ b/static-west.json @@ -16,7 +16,7 @@ }, { "hw-address": "C4:E9:84:99:9E:B4", - "ip-address": "10.112.96.4", + "ip-address": "10.112.96.5", "hostname": "bb-werkhof-18-cpe5" }, { From 07a387e41594daad5fcdd1ac832b4a5e0fc2ebf5 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Fri, 8 Dec 2017 22:36:34 +0100 Subject: [PATCH 20/31] Update static-west.json --- static-west.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static-west.json b/static-west.json index 79b9af1..0a4b514 100644 --- a/static-west.json +++ b/static-west.json @@ -11,12 +11,12 @@ }, { "hw-address": "C4:E9:84:99:A4:2E", - "ip-address": "10.112.96.4", + "ip-address": "10.112.96.5", "hostname": "bb-werkhof-00-cpe5" }, { "hw-address": "C4:E9:84:99:9E:B4", - "ip-address": "10.112.96.5", + "ip-address": "10.112.96.6", "hostname": "bb-werkhof-18-cpe5" }, { From 406ac5d5b15fc303cc437e2fe89fd446719b342a Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 10 Dec 2017 10:45:17 +0100 Subject: [PATCH 21/31] Martin-Sued1 & 2 angelegt --- static-sued.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/static-sued.json b/static-sued.json index be87cd7..42a2581 100644 --- a/static-sued.json +++ b/static-sued.json @@ -1,2 +1,12 @@ "reservations": [ -] \ No newline at end of file + { + "hw-address": "b8:27:eb:0c:5d:29", + "ip-address": "10.112.64.1", + "hostname": "Martin-Sued1" + }, + { + "hw-address": "b8:27:eb:59:08:7c", + "ip-address": "10.112.64.2", + "hostname": "Martin-Sued2" + } +] From b368e6d43a36f2bf0d1a4930557ad9f2f590c60c Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 10 Dec 2017 10:47:08 +0100 Subject: [PATCH 22/31] IPs korrigiert --- static-sued.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static-sued.json b/static-sued.json index 42a2581..568a767 100644 --- a/static-sued.json +++ b/static-sued.json @@ -1,12 +1,12 @@ "reservations": [ { "hw-address": "b8:27:eb:0c:5d:29", - "ip-address": "10.112.64.1", + "ip-address": "10.112.64.2", "hostname": "Martin-Sued1" }, { "hw-address": "b8:27:eb:59:08:7c", - "ip-address": "10.112.64.2", + "ip-address": "10.112.64.3", "hostname": "Martin-Sued2" } ] From c4e25702f839b9179612a67407685f4b1b3e42ec Mon Sep 17 00:00:00 2001 From: Leo Krueger Date: Thu, 4 Jan 2018 13:37:34 +0100 Subject: [PATCH 23/31] add entries as requested via mail on 30.12. --- static-sued.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/static-sued.json b/static-sued.json index 568a767..22653aa 100644 --- a/static-sued.json +++ b/static-sued.json @@ -8,5 +8,15 @@ "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" } ] From 972ae7ccdcffe7f4870435d3c630d0bcdf1f8700 Mon Sep 17 00:00:00 2001 From: Alexander <7adietri@users.noreply.github.com> Date: Fri, 5 Apr 2019 21:09:57 +0200 Subject: [PATCH 24/31] Email-Anfrage vom 1.4. --- static-west.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/static-west.json b/static-west.json index 0a4b514..b8f41c9 100644 --- a/static-west.json +++ b/static-west.json @@ -48,5 +48,15 @@ "hw-address": "00:0d:b9:3f:7b:f6", "ip-address": "10.112.96.24", "hostname": "apuschnacke" + }, + { + "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" } ] From 480732cee3e75dc8647e1f15ebab48d032e4a3a6 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Thu, 16 Apr 2020 20:47:58 +0200 Subject: [PATCH 25/31] speicher hinzugefuegt --- static-west.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static-west.json b/static-west.json index b8f41c9..437a78a 100644 --- a/static-west.json +++ b/static-west.json @@ -44,6 +44,11 @@ "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": "00:0d:b9:3f:7b:f6", "ip-address": "10.112.96.24", From a751c076ef4251490dde6a388b09794bff017e58 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sat, 20 Jun 2020 10:36:01 +0200 Subject: [PATCH 26/31] AschenlandUAPs hinzugefuegt, SchnackeAPU entfernt --- static-west.json | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/static-west.json b/static-west.json index 437a78a..fae2301 100644 --- a/static-west.json +++ b/static-west.json @@ -39,6 +39,26 @@ "ip-address": "10.112.96.13", "hostname": "brachvogel" }, + { + "hw-address": "44:D9:E7:7A:8E:3B", + "ip-address": "10.112.96.14", + "hostname": "AschenlandUAP1" + }, + { + "hw-address": "04:18:D6:A8:9F:56", + "ip-address": "10.112.96.15", + "hostname": "AschenlandUAP2" + }, + { + "hw-address": "44:D9:E7:7A:8B:CE", + "ip-address": "10.112.96.16", + "hostname": "AschenlandUAP3" + }, + { + "hw-address": "44:D9:E7:7A:8B:5C", + "ip-address": "10.112.96.17", + "hostname": "AschenlandUAP4" + }, { "hw-address": "00:24:21:2e:63:f9", "ip-address": "10.112.96.21", @@ -49,11 +69,6 @@ "ip-address": "10.112.96.23", "hostname": "speicher" }, - { - "hw-address": "00:0d:b9:3f:7b:f6", - "ip-address": "10.112.96.24", - "hostname": "apuschnacke" - }, { "hw-address": "e4:95:6e:45:6a:04", "ip-address": "10.112.96.25", From 1348d516c2d9e2dc983a43e026ef96085af0c6b3 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:57:22 +0200 Subject: [PATCH 27/31] Aschenland APs hinzugefuegt --- static-sued.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/static-sued.json b/static-sued.json index 22653aa..9fedc8c 100644 --- a/static-sued.json +++ b/static-sued.json @@ -18,5 +18,30 @@ "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" } ] From 72d5e33e565722338cf8e7ea74cf48fa5d83084e Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:58:29 +0200 Subject: [PATCH 28/31] Aschenland APs entfernt nach sued umgezogen --- static-west.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/static-west.json b/static-west.json index fae2301..7765ccf 100644 --- a/static-west.json +++ b/static-west.json @@ -39,26 +39,6 @@ "ip-address": "10.112.96.13", "hostname": "brachvogel" }, - { - "hw-address": "44:D9:E7:7A:8E:3B", - "ip-address": "10.112.96.14", - "hostname": "AschenlandUAP1" - }, - { - "hw-address": "04:18:D6:A8:9F:56", - "ip-address": "10.112.96.15", - "hostname": "AschenlandUAP2" - }, - { - "hw-address": "44:D9:E7:7A:8B:CE", - "ip-address": "10.112.96.16", - "hostname": "AschenlandUAP3" - }, - { - "hw-address": "44:D9:E7:7A:8B:5C", - "ip-address": "10.112.96.17", - "hostname": "AschenlandUAP4" - }, { "hw-address": "00:24:21:2e:63:f9", "ip-address": "10.112.96.21", From b44697bb479c14f55f5a8b0b2c1dcdacb25b2f88 Mon Sep 17 00:00:00 2001 From: Matthias Marx Date: Thu, 2 Jul 2020 13:14:43 +0200 Subject: [PATCH 29/31] =?UTF-8?q?Neuenfelde=20APs=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static-sued.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/static-sued.json b/static-sued.json index 9fedc8c..42f8e31 100644 --- a/static-sued.json +++ b/static-sued.json @@ -43,5 +43,30 @@ "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" } ] From 1c49fa9d3e02d73fa2bf8c66dc9a8e0d583cdbfb Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Thu, 7 Oct 2021 16:58:46 +0200 Subject: [PATCH 30/31] bb-gleis4a-solar hinzugefuegt --- static-west.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/static-west.json b/static-west.json index 7765ccf..4ebb489 100644 --- a/static-west.json +++ b/static-west.json @@ -1,4 +1,9 @@ "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", From 230a07910368e2c55bbdc59888aaa4da7eb5ac40 Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Sat, 18 Dec 2021 01:50:26 +0100 Subject: [PATCH 31/31] stubnitz-gw und stubnitz-museum hinzugefuegt --- static-ost.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/static-ost.json b/static-ost.json index be87cd7..1ee8c48 100644 --- a/static-ost.json +++ b/static-ost.json @@ -1,2 +1,12 @@ "reservations": [ -] \ No newline at end of file + { + "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" + } +]