Embedd the images into the README.md

.gitattributes

@@ -10,3 +10,4 @@
 *.png !text !filter !merge !diff
 *.pdf !text !filter !merge !diff
 *.pdf filter=lfs diff=lfs merge=lfs -text
+*.bin filter=lfs diff=lfs merge=lfs -text

README.md

@@ -1,2 +1,22 @@
-Das Diagram ist mit [PlantUML](https://plantuml.com/) erstellt.
-Es gibt auch einen [Online-Editor](https://plantuml-editor.kkeisuke.com/).
+# Heizhaus Netzwerk
+
+## Zugangsdaten
+
+### QR Code
+
+![QR Code](QRcode-AP-PaketQUELLE.png)
+
+### PDF
+
+Eine PDF mit den Zugangsdaten als QR Code und Klartextzum liegt zum Ausdrucken bei.
+
+[Link zur PDF](https://git.0x90.space/0x90/heizhaus-netzwerk/src/branch/master/QRcode-AP-PaketQUELLE.pdf)
+
+## Netzplan
+
+![Heizhaus Netzwerk](heizhaus_netzwerk.png)
+
+## Weitere Infos
+
+* Das Diagram ist mit [PlantUML](https://plantuml.com/) erstellt.
+* Es gibt auch einen [Online-Editor](https://plantuml-editor.kkeisuke.com/).

heizhaus_netzwerk.plantuml

@@ -1,21 +1,19 @@
 @startuml
 package "Heizhaus" {
   package "Technik-Raum" {
-    component modem [
-      Vodafone Kabel-Modem
-      ip 192.168.100.254/24 (nur im Fehlerfall)
+    component coax [
+      TV Buchse
     ]
     component router1 [
-      Fritzbox 7360 Wifi-Router
+      Vodafone Fritzbox 6660 Kabel
       ssid PaketQUELLE.
-      bssid 08:96:d7:2d:cb:ae
       ip 10.42.0.1/16
       dhcp-range 10.42.100.1-10.42.103.255
-      mac 08:96:d7:2d:cb:ac
+      mac 3c:37:12:17:d9:84
     ]
     component switch1 [
-      Longshine 9420 Switch
-      ip 10.42.0.16
+      Managed Switch
+      ip 10.42.0.16/16
       mac 00:08:54:a4:e3:94
     ]
     interface "patch-panel 15" as pp15
@@ -34,6 +32,8 @@ package "Heizhaus" {
     Wifi-Router
     ssid KellerQUELLE.
     bssid c0:25:06:89:25:d7
+    ip 10.42.100.221/16 via dhcp
+    mac c0:25:06:89:25:d5
   ]
 
   package Brücke {
@@ -41,82 +41,78 @@ package "Heizhaus" {
       Wifi-AP
       ssid PaketQUELLE.
       bssid 0c:80:63:66:22:e9
+      ip 10.42.0.36/16
     ]
   }
 
-  component router9 [
-    Wifi-AP
-    ssid PaketQUELLE.
-    bssid 0c:80:63:66:24:6f
-  ]
-
   package Schneiderei {
-    component router3 [
-      Wifi-AP
-      mac 34:81:c4:e9:76:ce
-    ]
     component switch2 [
-      Switch?
+      Managed Switch
+      ip 10.42.0.17/16
+      mac 00:24:73:a0:08:20
     ]
   }
 
   package 0x90.space {
     component router4 [
-      Wifi-Router
+      Wifi-AP
       ssid PaketQUELLE.
-      bssid 0c:80:63:42:0d:b4
+      bssid e8:de:27:59:0e:33
       ip 10.42.0.32/16
     ]
   }
 
-  package "Schacht neben Lücke-Aufzug" {
-    component repeater1 [
-      Repeater
-      deaktiviert, suche Kontakt!
-      ssid 0x90.space
-      bssid cc:ce:1e:0f:0b:31
+  package Eddie {
+    component router9 [
+      Wifi-AP
+      ssid PaketQUELLE / PaketQUELLE-Gast
+      bssid f0:b0:14:c9:bd:90
+      ip via dhcp
+      subnetted
     ]
   }
 
   package Foto-Studio {
+    component switchF [
+      Unmanaged Gigabit Switch
+    ]
     component router5 [
-      Wifi-Router
+      Wifi-AP
       ssid PaketQUELLE.
-      bssid 18:d6:c7:34:5a:11
       ip 10.42.0.33/16
-      mac 18:d6:c7:34:5a:11
+      mac 0c:80:63:66:24:6f
     ]
   }
 
   package Werkstätten {
     component router6 [
-      Wifi-Router
+      Wifi-AP
       ssid PaketQUELLE.
       ip 10.42.0.34/16
       mac 2c:b0:5d:7e:73:06
     ]
     component router7 [
-      Wifi-Router
+      Wifi-AP
       ssid PaketQUELLE.
       ip 10.42.0.35/16
       mac 0c:80:63:41:fe:74
     ]
   }
 
-  modem -down- "LAN1" router1
-  router1 -- switch1
-  switch1 -- pp20
-  switch1 -- dose
-  switch1 -- schacht
-  switch1 -- pp15
+  coax -down- router1
+  router1 -- "1G" switch1
+  switch1 "100M" -- pp20
+  switch1 "100M" -- dose
+  switch1 "100M" -- schacht
+  switch1 "100M" -- pp15
   pp20 -- flo
-  dose -- router2
-  schacht -- router3
-  router3 -- switch2
-  switch2 -- router4
-  router4 -- repeater1
-  pp15 -- router5
-  router5 -- router6
-  router6 -- router7
+  dose -- "100M" router2
+  schacht -- switch2
+  switch2 -- "100M" router4
+  router4 -- router9
+  pp15 -- switchF
+  switchF -- "100M" router5
+  switchF -- "100M" router6
+  router6 -- "100M" router7
 }
 @enduml

openwrt/etc-config/dhcp

@@ -0,0 +1,14 @@
+config dhcp 'lan'                                              
+        option interface 'lan'                                 
+        option start '100'                                     
+        option limit '150'                                     
+        option leasetime '12h'                                 
+        option dhcpv4 'server'                                 
+        option ignore '1'                                      
+        list ra_flags 'none'                                   
+                                                               
+config odhcpd 'odhcpd'                                         
+        option maindhcp '0'                                    
+        option leasefile '/tmp/hosts/odhcpd'                   
+        option leasetrigger '/usr/sbin/odhcpd-update'          
+        option loglevel '4'                                    

openwrt/etc-config/firewall

@@ -0,0 +1,16 @@
+config defaults
+        option syn_flood '1'
+        option input 'ACCEPT'
+        option output 'ACCEPT'
+        option forward 'REJECT'
+
+config zone
+        option name 'lan'
+        option input 'ACCEPT'
+        option output 'ACCEPT'
+        option forward 'ACCEPT'
+        list network 'lan'
+
+config include
+        option path '/etc/firewall.user'
+

openwrt/etc-config/wireless

@@ -0,0 +1,43 @@
+config wifi-device 'radio0'
+        option type 'mac80211'
+        option hwmode '11g'
+        option path 'platform/ahb/18100000.wmac'
+        option htmode 'HT20'
+        option txpower '10'
+        option country 'DE'
+        option cell_density '3'
+        option channel '13'
+
+config wifi-iface 'default_radio0'
+        option device 'radio0'
+        option network 'lan'
+        option mode 'ap'
+        option ssid 'PaketQUELLE.'
+        option encryption 'psk2'
+        option key 'heizhaus2017!'
+        option ieee80211w '1'
+        option wpa_disable_eapol_key_retries '1'
+
+config wifi-device 'radio1'
+        option type 'mac80211'
+        option channel '36'
+        option hwmode '11n'
+        option path 'pci0000:00/0000:00:00.0'
+        option country 'DE'
+        option cell_density '3'
+        option htmode 'HT40'
+        option txpower '17'
+
+config wifi-iface 'default_radio1'
+        option device 'radio1'
+        option network 'lan'
+        option mode 'ap'
+        option ssid 'PaketQUELLE.'
+        option encryption 'psk2'
+        option ieee80211r '1'
+        option ft_over_ds '1'
+        option ft_psk_generate_local '1'
+        option wpa_disable_eapol_key_retries '1'
+        option ieee80211w '1'
+        option key 'heizhaus2017!'
+