Zeile 14: |
Zeile 14: |
| |Position= a.k.a. Geo-Koordinaten | | |Position= a.k.a. Geo-Koordinaten |
| |Modell= TL-WRxxxxx | | |Modell= TL-WRxxxxx |
| + | |Gluon= {ja, nein} |
| |Antenne= Antennentyp: {Rundstrahler, Richtstrahler, ...} | | |Antenne= Antennentyp: {Rundstrahler, Richtstrahler, ...} |
| |VPN= {ja, nein} | | |VPN= {ja, nein} |
Zeile 22: |
Zeile 23: |
| </pre> | | </pre> |
| | | |
− | {{Hinweis|Titel=Umrechnung von Geo-Koordinaten|Text=Mediawiki kann am besten Werte in Grad, Minuten, Sekunden (z.B.: 50° 4' 59.39" N 8° 13' 45.88" E ) verarbeiten. Zum Umrechnen gibs Helfer: [http://rechneronline.de/geo-koordinaten/ rechneronline.de/geo-koordinaten]}} | + | Für Gateways sind noch folgende Zeilen interessant: |
| + | <pre> |
| + | |ExitVPNprovider= {ipredator, mullvad, keiner, unbekannt} |
| + | |ExitVPNaccount= Account Name/Nummer |
| + | |ExitVPNpaiduntil= Datum bis zu dem gezahlt wurde. |
| + | |Tinc-Key= Der Tinc-Key |
| + | </pre> |
| + | |
| + | <pre> |
| + | Für Backbone Geraete sind noch folgende Zeilen interessant: |
| + | |Type=Backbone CPE |
| + | |Gluon=0 |
| + | |AirOS=1 |
| + | |Antenne=14db 60* |
| + | |VPN=nein |
| + | |MAC= |
| + | |Kommentar=5Ghz Richtung Mainz Alstadt |
| + | |Backbone=ja |
| + | |Frequenz=100 / 5500 MHz (DFS) |
| + | |Kanalbreite=40Mhz |
| + | |AC=nein |
| + | |Richtung=Alstadt |
| + | |VLAN=5 |
| + | </pre> |
| + | |
| + | |
| + | |
| + | {{Hinweis|Titel=Umrechnung von Geo-Koordinaten|Text=Mediawiki kann am besten Werte in Grad, Minuten, Sekunden (z.B.: 50° 4' 59.39" N 8° 13' 45.88" E ) verarbeiten. Zum Umrechnen gibt es Helfer: [http://rechneronline.de/geo-koordinaten/ rechneronline.de/geo-koordinaten]}} |
| + | |
| + | {{Hinweis|Titel=Umrechnung von Zeit|Text=Zum addieren von Tagen auf Zeitpunkte gibt es Helfer: [http://www.timeanddate.com/date/dateadded.html Add to or subtract from a date]}} |
| </noinclude><includeonly> | | </noinclude><includeonly> |
| | | |
− | {{Category Add|Nodes}} | + | |
− | {| border="2" cellspacing="0" cellpadding="4" rules="all" style="float:{{{float|right}}}; width:300px; margin:.5em 0 1em 1em; border:solid 1px #{{Color|Schwarz}}; border-collapse:collapse; background: #{{Color|Grau}}; empty-cells:hide" | + | {{#ifeq: {{{Gluon|}}} | ja | |
− | |- style="background:#{{Color|Schwarz}}; color:#{{Color|Weiss}}; text-align:center;" | + | {{Category Add|Gluon-Nodes}} | |
− | ! colspan=2| Freifunk Knoten: {{#if: {{{Name|}}} | {{{Name}}} | Namenloser Frefunkrouter}} | + | {{Category Add|Nodes}} | |
| + | }} |
| + | |
| + | {| border="2" cellspacing="0" cellpadding="4" rules="all" style="float:{{{float|left}}}; width:300px; margin:.5em 0 1em 1em; border:solid 1px #{{Color|Schwarz}}; border-collapse:collapse; background: #{{Color|Grau}}; empty-cells:hide" |
| + | |- style="background:#{{Color|Pink}}; text-align:center;" |
| + | ! colspan=2| Freifunk {{#ifeq: {{{Gluon|}}} | ja | Gluon-}}{{#ifeq: {{{Gateway|}}} | ja | Gateway-}}{{#ifeq: {{{Backbone|}}} | ja | Backbone-}}Knoten: {{#if: {{{Name|}}} | {{{Name}}} | Namenlos}} |
| + | |- |
| + | {{#ifeq: {{{Backbone|}}} | ja | |
| + | {{!-}} style="background:#{{Color|Schwarz}}; color:#{{Color|Weiss}}; text-align:center;" |
| + | {{!}} colspan=2 {{!}} '''Backbone Info''' |
| + | {{Category Add|Backbone}} |
| + | }} |
| + | |-{{#if: {{{SSID|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} SSID |
| + | {{!}} {{{SSID}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{AirOS|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} AirOS |
| + | {{!}} {{{AirOS}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{Frequenz|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} Frequenz |
| + | {{!}} {{{Frequenz}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{Kanalbreite|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} Kanalbreite |
| + | {{!}} {{{Kanalbreite}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{AC|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} AC Standart |
| + | {{!}} {{{AC}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{Richtung|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} Richtung |
| + | {{!}} {{{Richtung}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{VLAN|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} Standort VLAN |
| + | {{!}} {{{VLAN}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{SWPort|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} Switch Port |
| + | {{!}} {{{SWPort}}} |
| + | }} |
| |- | | |- |
| {{#ifeq: {{{Gateway|}}} | ja | | | {{#ifeq: {{{Gateway|}}} | ja | |
− | {{!-}} style="background:#{{Color|Pink}}; text-align:center;" | + | {{!-}} style="background:#{{Color|Schwarz}}; color:#{{Color|Weiss}}; text-align:center;" |
− | {{!}} colspan=2 {{!}} '''Gateway {{#if: {{{Name|}}} | {{{Name}}} }}''' | + | {{!}} colspan=2 {{!}} '''Gateway Info''' |
| + | {{Category Add|Gateways}} |
| + | }} |
| |- | | |- |
| {{#if: {{{ExitVPNprovider|}}} | | | {{#if: {{{ExitVPNprovider|}}} | |
Zeile 39: |
Zeile 121: |
| }} | | }} |
| |- | | |- |
− | {{#if: {{{ExitVPNlastpaid|}}} | | + | {{#if: {{{ExitVPNaccount|}}} | |
− | {{!}} style="vertical-align:top" {{!}} zuletzt bezahlt am | + | {{!}} style="vertical-align:top" {{!}} Nummer/Name |
− | {{!}} {{{ExitVPNlastpaid}}} | + | {{!}} {{{ExitVPNaccount}}} |
| + | }} |
| + | |- |
| + | {{#if: {{{ExitVPNpaiduntil|}}} | |
| + | {{!}} style="vertical-align:top" {{!}} bezahlt bis zum |
| + | {{!}} {{{ExitVPNpaiduntil}}} |
| }} | | }} |
| |- | | |- |
| {{#if: {{{Tinc-Key|}}} | | | {{#if: {{{Tinc-Key|}}} | |
− | {{!-}} style="background:#{{Color|Pink}}; text-align:center;" | + | {{!-}} style="background:#{{Color|Schwarz}}; color:#{{Color|Weiss}}; text-align:center;" |
| {{!}} colspan=2 {{!}} '''Tinc-Key''' | | {{!}} colspan=2 {{!}} '''Tinc-Key''' |
| {{!}}- | | {{!}}- |
− | {{!}} colspan=2 {{!}} {{{Tinc-Key}}} | + | {{!}} colspan=2 {{!}} |
| + | {{#ask: [[Node-Name::{{{Name}}}]] |?Node-Tinc-Key= |
| + | |format=template |
| + | |template=Tinc-Tabelle |
| + | |default=nix gefunden |
| }} | | }} |
− |
| |
| }} | | }} |
| |- | | |- |
| {{#if: {{{Adresse|}}}{{{Standort|}}}{{{Position|}}}{{{Modell|}}}{{{Antenne|}}}{{{VPN|}}}{{{MAC|}}} | | | {{#if: {{{Adresse|}}}{{{Standort|}}}{{{Position|}}}{{{Modell|}}}{{{Antenne|}}}{{{VPN|}}}{{{MAC|}}} | |
− | {{!-}} style="background:#{{Color|Pink}}; text-align:center;" | + | {{!-}} style="background:#{{Color|Schwarz}}; color:#{{Color|Weiss}}; text-align:center;" |
| {{!}} colspan=2 {{!}} '''Informationen''' | | {{!}} colspan=2 {{!}} '''Informationen''' |
| }} | | }} |
Zeile 91: |
Zeile 181: |
| |- | | |- |
| {{#if: {{{Kommentar|}}} | | | {{#if: {{{Kommentar|}}} | |
− | {{!-}} style="background:#{{Color|Pink}}; text-align:center;" | + | {{!-}} style="background:#{{Color|Schwarz}}; color:#{{Color|Weiss}}; text-align:center;" |
| {{!}} colspan=2 {{!}} '''Kommentar''' | | {{!}} colspan=2 {{!}} '''Kommentar''' |
| {{!}}- | | {{!}}- |
Zeile 97: |
Zeile 187: |
| }} | | }} |
| |} | | |} |
| + | |
| + | |
| + | |
| | | |
| {{#if: {{{Adresse|}}} | | | {{#if: {{{Adresse|}}} | |
Zeile 102: |
Zeile 195: |
| {{#subobject:{{{Adresse}}} | Freifunk-Router=1 | Node-Adresse={{{Adresse}}} }} | | {{#subobject:{{{Adresse}}} | Freifunk-Router=1 | Node-Adresse={{{Adresse}}} }} |
| {{#if: {{{Name|}}} | {{#subobject:{{{Adresse|}}} | Node-Name={{{Name}}} }} }} | | {{#if: {{{Name|}}} | {{#subobject:{{{Adresse|}}} | Node-Name={{{Name}}} }} }} |
| + | {{#if: {{{Backbone|}}} | {{#subobject:{{{Backbone|}}} | Node-Backbone={{{Backbone}}} }} }} |
| + | {{#if: {{{Antenne|}}} | {{#subobject:{{{Adresse|}}} | Node-Antenne={{{Antenne}}} }} }} |
| {{#if: {{{Position|}}} | {{#subobject:{{{Adresse|}}} | Node-Position={{{Position}}} }} }} | | {{#if: {{{Position|}}} | {{#subobject:{{{Adresse|}}} | Node-Position={{{Position}}} }} }} |
| {{#if: {{{Standort|}}} | {{#subobject:{{{Adresse|}}} | Node-Standort={{{Standort}}} }} }} | | {{#if: {{{Standort|}}} | {{#subobject:{{{Adresse|}}} | Node-Standort={{{Standort}}} }} }} |
Zeile 108: |
Zeile 203: |
| {{#if: {{{VPN|}}} | {{#subobject:{{{Adresse|}}} | Node-VPN={{{VPN}}} }} }} | | {{#if: {{{VPN|}}} | {{#subobject:{{{Adresse|}}} | Node-VPN={{{VPN}}} }} }} |
| {{#if: {{{MAC|}}} | {{#subobject:{{{Adresse|}}} | Node-MAC={{{MAC}}} }} }} | | {{#if: {{{MAC|}}} | {{#subobject:{{{Adresse|}}} | Node-MAC={{{MAC}}} }} }} |
| + | {{#ifeq: {{{Gluon|}}} | ja | {{#subobject:{{{Adresse|}}} | Gluon-Node=1 }} | {{#subobject:{{{Adresse|}}} | Gluon-Node=0 }} }} |
| {{#if: {{{Dienste|}}} | {{#subobject:{{{Adresse|}}} | Node-Dienste={{{Dienste}}}|+sep=, }} }} | | {{#if: {{{Dienste|}}} | {{#subobject:{{{Adresse|}}} | Node-Dienste={{{Dienste}}}|+sep=, }} }} |
| {{#if: {{{Kommentar|}}} | {{#subobject:{{{Adresse|}}} | Node-Kommentar={{{Kommentar}}} }} }} | | {{#if: {{{Kommentar|}}} | {{#subobject:{{{Adresse|}}} | Node-Kommentar={{{Kommentar}}} }} }} |
− | {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | Node-Dienste=Gateway-{{{Name}}} }} }} | + | {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | {{#if: {{{Tinc-Key|}}} | {{#subobject:{{{Adresse|}}} | Node-Dienste=Tinc-Gateway }} }} }} }} |
| {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | {{#if: {{{ExitVPNprovider|}}} | {{#subobject:{{{Adresse|}}} | ExitVPNprovider={{{ExitVPNprovider}}} }} }} }} }} | | {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | {{#if: {{{ExitVPNprovider|}}} | {{#subobject:{{{Adresse|}}} | ExitVPNprovider={{{ExitVPNprovider}}} }} }} }} }} |
− | {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | {{#if: {{{ExitVPNlastpaid|}}} | {{#subobject:{{{Adresse|}}} | ExitVPNlastpaid={{{ExitVPNlastpaid}}} }} }} }} }} | + | {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | {{#if: {{{ExitVPNaccount|}}} | {{#subobject:{{{Adresse|}}} | ExitVPNaccount={{{ExitVPNaccount}}} }} }} }} }} |
| + | {{#ifeq: {{{Gateway|}}} | ja | {{#subobject:{{{Adresse|}}} | Freifunk-Gateway=1 | {{#if: {{{ExitVPNpaiduntil|}}} | {{#subobject:{{{Adresse|}}} | ExitVPNpaiduntil={{{ExitVPNpaiduntil}}} }} }} }} }} |
| {{#if: {{{Tinc-Key|}}} | {{#subobject:{{{Adresse|}}} | Node-Tinc-Key={{{Tinc-Key}}} }} }} | | {{#if: {{{Tinc-Key|}}} | {{#subobject:{{{Adresse|}}} | Node-Tinc-Key={{{Tinc-Key}}} }} }} |
| | | |
| | GEFAHR! Keine Adresse angegeben! }} | | | GEFAHR! Keine Adresse angegeben! }} |
| </includeonly> | | </includeonly> |