Skip to content

Commit

Permalink
Merge branch 'main' of github.com:bergmann-it/doku
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbergmann
cbergmann committed Dec 9, 2023
2 parents 42c3486 + b134471 commit 231c40d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 45 deletions.
2 changes: 1 addition & 1 deletion build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
cd ~/doku
git pull
git reset --hard
FORCE_SHOW_EDIT_PAGE_LINK=true DOCSEARCH_ENABLED=true DOCSEARCH_ENGINE=lunr NODE_PATH="$(/usr/bin/npm -g root)" ~/bin/antora --attribute data-uri --attribute allow-uri-read --generator antora-site-generator-lunr --fetch --clean antora-playbook.yml
FORCE_SHOW_EDIT_PAGE_LINK=true DOCSEARCH_ENABLED=true DOCSEARCH_ENGINE=lunr NODE_PATH="$(/usr/bin/npm -g root)" ~/bin/antora --generator antora-site-generator-lunr --fetch --clean antora-playbook.yml
46 changes: 3 additions & 43 deletions it/modules/ROOT/pages/network.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,9 @@
= Netzwerk

== Physikalisches Netzwerk
== Netzwerkübersicht
Das Netzwerk in der Frankensteiner Str. 15 ist relativ einfach um den Mittelpunkt im Kellerflur aufgebaut:

[svgbob]
....
------+---------------------------------------------------------------------------------------
2. OG |
------'
------+------------------------------+-+------+-------------------+-+-------+-----------------
1. OG | | | Flur | +-----------+ | | Buero | +---------+
------' | '------' | AP | | '-------' | Gelbes |
| | 1. OG +---. | | Telefon +-.
| +-----------+ | | +---------+ |
| | | |
| +-------+ | | .--O |
| | DECT | | | | |
| | Basis +-------|-|-|-. |
| +-------+ | | | | |
| | | | | |
---+---------------------------------+--------------------------+-+-+-+-------------------+---
EG | +-----------+ | | | |
---' | AP | | | | |
| Garderobe +-. | | | |
+-----------+ | | | | |
-------+------------+-+--------------+--+-+------+------------+-+---+-+-------------------+---
Keller | | | Heizungsraum | | | Flur | | | | | |
-------' | '--------------' | '------' | | | | |
.-,( ),-. | +-------+ | +-----------+ | | | | |
.-( )-. | | VDSL | | | Router | | | | | |
( internet )--+----+ Modem | | ,+- -+. | | | | +---------+ |
'-( ).-' | | +------+----+ eth0 eth4 +--' | | | | Switch | |
'-.( ).-' | +-------+ | `+- eth3 +----' | | ,+- | |
| | | eth1 +--------' `-+ port4 -+. |
| | | eth2 +------------+ port1 +--. |
| | | -+' .---------+ port2 -+' | |
| | +-----------+ | `+- | | |
| | | +---------+ | |
| | | | |
| | +-----+--+ +----+--+-+
| | | Homepi | | ATA |
| | | | | Adapter |
| | +--------+ +---------+
....
image::network.drawio.svg[]

== Netzwerkdosen

Expand All @@ -62,7 +22,7 @@ Keller | | | Heizungsraum | | | Flur | | | | |

== Uplink

Der Uplink ist eine DOCSIS Leitung von link:https://www.unitymedia.de/benutzerkonto/login/zugangsdaten[Vodafone] (ehemals Unitymedia).
Der Uplink ist eine 250 Mbit/s DSL Leitung von der link:https://www.telekom.de/mein-kundencenter[Telekom].

Es gibt verschiedene Wege von außen auf die Infrastruktur zuzugreifen. Details dazu auf der Seite xref:services/uplink/remote_access.adoc[Remote access].

Expand Down
2 changes: 1 addition & 1 deletion it/modules/ROOT/pages/services/wifi.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

== Hardware

Das Wifi Netzwerk besteht zu einen aus dem Unifi Controller welcher auf dem xref:homepi.adoc[Homepi] läuft und aus zwei link:https://www.ui.com/unifi/unifi-ap-ac-lite/[Unifi AP AC lite].
Das Wifi Netzwerk besteht zu einen aus dem Unifi Controller welcher auf dem xref:homepi.adoc[Homepi] läuft, aus zwei link:https://www.ui.com/unifi/unifi-ap-ac-lite/[Unifi AP AC lite] (ap-eg, ap-keller) und einem link:https://techspecs.ui.com/unifi/wifi/u6-plus[Unifi U6+] (ap-og1).

== Controller

Expand Down

0 comments on commit 231c40d

Please sign in to comment.