diff --git a/files/interfaces-troisdorf4.j2 b/files/interfaces-troisdorf4.j2 index 1ab9164..ff9d7f1 100644 --- a/files/interfaces-troisdorf4.j2 +++ b/files/interfaces-troisdorf4.j2 @@ -15,7 +15,7 @@ iface lo inet6 loopback # The primary network interface allow-hotplug {{ sn_interface_name }} iface {{ sn_interface_name }} inet static - address 212.129.50.141 + address 46.4.156.114 netmask 255.255.255.255 gateway 163.172.210.1 pointopoint 163.172.210.1 @@ -27,7 +27,7 @@ iface {{ sn_interface_name }} inet static post-up iptables -t nat -A POSTROUTING -o $IFACE -j MASQUERADE auto 6to4 iface 6to4 inet6 6to4 - local 212.129.50.141 + local 46.4.156.114 # GRE Tunnel zum Rheinland Backbone # - Die Konfigurationsdaten werden vom Rheinland Backbone vergeben und zugewiesen @@ -37,7 +37,7 @@ auto gre-bb-a.ak.ber iface gre-bb-a.ak.ber inet static address 100.64.6.13 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 212.129.50.141 remote 185.66.195.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.114 remote 185.66.195.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.104 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -54,7 +54,7 @@ auto gre-bb-b.ak.ber iface gre-bb-b.ak.ber inet static address 100.64.6.19 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 212.129.50.141 remote 185.66.195.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.114 remote 185.66.195.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.104 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -72,7 +72,7 @@ auto gre-bb-a.ix.dus iface gre-bb-a.ix.dus inet static address 100.64.6.17 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 212.129.50.141 remote 185.66.193.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.114 remote 185.66.193.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.104 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -90,7 +90,7 @@ auto gre-bb-b.ix.dus iface gre-bb-b.ix.dus inet static address 100.64.6.23 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 212.129.50.141 remote 185.66.193.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.114 remote 185.66.193.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.104 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -107,7 +107,7 @@ auto gre-bb-a.fra3.f iface gre-bb-a.fra3.f inet static address 100.64.6.15 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 212.129.50.141 remote 185.66.194.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.114 remote 185.66.194.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.104 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -125,7 +125,7 @@ auto gre-bb-b.fra3.f iface gre-bb-b.fra3.f inet static address 100.64.6.21 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 212.129.50.141 remote 185.66.194.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.114 remote 185.66.194.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.104 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 diff --git a/files/interfaces-troisdorf5.j2 b/files/interfaces-troisdorf5.j2 index e600361..07ec939 100644 --- a/files/interfaces-troisdorf5.j2 +++ b/files/interfaces-troisdorf5.j2 @@ -15,7 +15,7 @@ iface lo inet6 loopback # The primary network interface allow-hotplug {{ sn_interface_name }} iface {{ sn_interface_name }} inet static - address 62.210.5.90 + address 46.4.156.115 netmask 255.255.255.255 gateway 163.172.210.1 pointopoint 163.172.210.1 @@ -27,7 +27,7 @@ iface {{ sn_interface_name }} inet static post-up iptables -t nat -A POSTROUTING -o $IFACE -j MASQUERADE auto 6to4 iface 6to4 inet6 6to4 - local 62.210.5.90 + local 46.4.156.115 # GRE Tunnel zum Rheinland Backbone # - Die Konfigurationsdaten werden vom Rheinland Backbone vergeben und zugewiesen @@ -37,7 +37,7 @@ auto gre-bb-a.ak.ber iface gre-bb-a.ak.ber inet static address 100.64.2.151 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.5.90 remote 185.66.195.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.115 remote 185.66.195.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.105 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -54,7 +54,7 @@ auto gre-bb-b.ak.ber iface gre-bb-b.ak.ber inet static address 100.64.2.153 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.5.90 remote 185.66.195.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.115 remote 185.66.195.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.105 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -72,7 +72,7 @@ auto gre-bb-a.ix.dus iface gre-bb-a.ix.dus inet static address 100.64.2.155 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.5.90 remote 185.66.193.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.115 remote 185.66.193.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.105 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -90,7 +90,7 @@ auto gre-bb-b.ix.dus iface gre-bb-b.ix.dus inet static address 100.64.2.157 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.5.90 remote 185.66.193.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.115 remote 185.66.193.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.105 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 diff --git a/files/interfaces-troisdorf6.j2 b/files/interfaces-troisdorf6.j2 index 1877aa5..113874b 100644 --- a/files/interfaces-troisdorf6.j2 +++ b/files/interfaces-troisdorf6.j2 @@ -15,7 +15,7 @@ iface lo inet6 loopback # The primary network interface allow-hotplug {{ sn_interface_name }} iface {{ sn_interface_name }} inet static - address 62.210.12.122 + address 46.4.156.116 netmask 255.255.255.255 gateway 163.172.210.1 pointopoint 163.172.210.1 @@ -28,7 +28,7 @@ iface {{ sn_interface_name }} inet static auto 6to4 iface 6to4 inet6 6to4 - local 62.210.12.122 + local 46.4.156.116 post-up ip6tables -P OUTPUT ACCEPT post-up ip6tables -A OUTPUT -o $IFACE -d fc00::/7 -j DROP @@ -40,7 +40,7 @@ auto gre-bb-a.ak.ber iface gre-bb-a.ak.ber inet static address 100.64.2.159 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.12.122 remote 185.66.195.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.116 remote 185.66.195.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.106 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -57,7 +57,7 @@ auto gre-bb-b.ak.ber iface gre-bb-b.ak.ber inet static address 100.64.2.161 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.12.122 remote 185.66.195.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.116 remote 185.66.195.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.106 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -75,7 +75,7 @@ auto gre-bb-a.ix.dus iface gre-bb-a.ix.dus inet static address 100.64.2.163 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.12.122 remote 185.66.193.0 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.116 remote 185.66.193.0 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.106 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 @@ -93,7 +93,7 @@ auto gre-bb-b.ix.dus iface gre-bb-b.ix.dus inet static address 100.64.2.165 netmask 255.255.255.254 - pre-up ip tunnel add $IFACE mode gre local 62.210.12.122 remote 185.66.193.1 ttl 255 + pre-up ip tunnel add $IFACE mode gre local 46.4.156.116 remote 185.66.193.1 ttl 255 post-up iptables -t nat -A POSTROUTING -o $IFACE -j SNAT --to-source 185.66.193.106 post-up iptables -t mangle -A POSTROUTING -p tcp --tcp-flags SYN,RST SYN -o $IFACE -j TCPMSS --set-mss 1312 post-up ip link set $IFACE mtu 1400 diff --git a/files/yanic.conf.j2 b/files/yanic.conf.j2 index 727c261..2ca74e3 100644 --- a/files/yanic.conf.j2 +++ b/files/yanic.conf.j2 @@ -10,27 +10,18 @@ synchronize = "1m" # how often request per multicast collect_interval = "1m" -# table of a site to save stats for (not exists for global only) -#[respondd.sites.example] -## list of domains on this site to save stats for (empty for global only) -#domains = [] -## example -[respondd.sites.ff] -domains = ["{{ yanic_domain }}"] - -# interface that has an IP in your mesh network [[respondd.interfaces]] # name of interface on which this collector is running ifname = "bat0" # ip address which is used for sending -# (optional - without definition used a address of ifname) +# (optional - without definition used a address of ifname - prefered link local) #ip_address = "fd2f:5119:f2d::5" # disable sending multicast respondd request # (for receiving only respondd packages e.g. database respondd) #send_no_request = false # multicast address to destination of respondd -# (optional - without definition used batman default ff02::2:1001) -#multicast_address = "ff05::2:1001" +# (optional - without definition used default ff05::2:1001) +#multicast_address = "ff02::2:1001" # define a port to listen # if not set or set to 0 the kernel will use a random free port at its own #port = 10001 @@ -39,14 +30,14 @@ ifname = "bat0" # This is useful for testing purposes or for a little standalone installation. [webserver] enable = true -bind = "0.0.0.0:8080" -webroot = "/opt/freifunk/yanic" +bind = "0.0.0.0:80" +webroot = "/opt/freifunk/yanic/" [nodes] # Cache file # a json file to cache all data collected directly from respondd -state_path = "/opt/freifunk/yanic/state.json" +state_path = "/var/lib/yanic/state.json" # prune data in RAM, cache-file and output json files (i.e. nodes.json) # that were inactive for longer than prune_after = "7d" @@ -73,18 +64,22 @@ offline_after = "10m" # List of site_codes of nodes that should be included in the output #sites = ["ffhb"] # -# replace the site_code with the domain_code in this output -# e.g. site_code='ffhb',domain_code='city' => site_code='city', domain_code='' -#domain_as_site = true -# -# append on the site_code the domain_code with a '.' in this output -# e.g. site_code='ffhb',domain_code='city' => site_code='ffhb.city', domain_code='' -#domain_append_site = true -# # set has_location to true if you want to include only nodes that have geo-coordinates set # (setting this to false has no sensible effect, unless you'd want to hide nodes that have coordinates) #has_location = true + +#[respondd.sites.fftdf] +#domains = ["tdf-tdf"] + +#[nodes.output.meshviewer-ffrgb.filter] +#no_owner = true +#blacklist = [] +#sites = ["flu","tdf","inn"] + + + + #[nodes.output.example.filter.in_area] # nodes outside this area are not shown on the map but are still listed as a node without coordinates #latitude_min = 34.30 @@ -100,7 +95,7 @@ path = "/opt/freifunk/yanic/meshviewer.json" [nodes.output.meshviewer-ffrgb.filter] # WARNING: if it is not set, it will publish contact information of other persons -no_owner = true +no_owner = false #blacklist = ["00112233445566", "1337f0badead"] #sites = ["ffhb"] #has_location = true @@ -129,7 +124,7 @@ graph_path = "/opt/freifunk/yanic/graph.json" [nodes.output.meshviewer.filter] # WARNING: if it is not set, it will publish contact information of other persons -no_owner = true +no_owner = false # definition for nodelist.json @@ -139,7 +134,7 @@ path = "/opt/freifunk/yanic/nodelist.json" [nodes.output.nodelist.filter] # WARNING: if it is not set, it will publish contact information of other persons -no_owner = true +no_owner = false @@ -161,11 +156,11 @@ delete_interval = "1h" # firmware: store the count of nodes tagged with firmware # model: store the count of nodes tagged with hardware model [[database.connection.influxdb]] -enable = false -address = "http://localhost:8086" -database = "ffhb" -username = "" -password = "" +enable = true +address = "http://195.201.17.16:8886" +database = "freifunk" +username = "freifunk" +password = "dude1990" # Tagging of the data (optional) [database.connection.influxdb.tags] @@ -201,4 +196,4 @@ address = "stats.bremen.freifunk.net:11001" # Logging [[database.connection.logging]] enable = false -path = "/var/log/yanic.log" +path = "/var/log/yanic.log" \ No newline at end of file