Browse Source

Remove broken inventory

Markus Lindenberg 9 years ago
parent
commit
4366725c2e

+ 0 - 2
inventories/ffdo/group_vars/all/peering.yml

@@ -1,2 +0,0 @@
-as: '65403'
-routerid: "{{mesh_ipv4|ipaddr('address')}}"

+ 0 - 6
inventories/ffdo/group_vars/mapservers/gluon-collector.yml

@@ -1,6 +0,0 @@
-gluon_collector_http_port: 8080
-gluon_collector_http_address: "[::1]"
-gluon_collector_receivers:
-- type: announced
-  port: 21214
-  interface: bat0

+ 0 - 2
inventories/ffdo/group_vars/mapservers/meshviewer.yml

@@ -1,2 +0,0 @@
-meshviewer_data_url: "https://map.ffdo.de/data/"
-meshviewer_site_name: Freifunk Dortmund

+ 0 - 39
inventories/ffdo/group_vars/mapservers/nginx.yml

@@ -1,39 +0,0 @@
-nginx_sites:
-  default:
-  - listen 80 default_server
-  - "listen [::]:80 default_server"
-  - server_name _
-  - listen 443 ssl
-  - "listen [::]:443 ssl"
-  - "ssl_certificate /etc/nginx/ssl/wiki.ffdo.de.crt"
-  - "ssl_certificate_key /etc/nginx/ssl/wiki.ffdo.de.key"
-  - "ssl_dhparam /etc/nginx/dhparams.pem"
-  - "root /var/www"
-  - index index.html
-  - "location = / { return 302 /meshviewer/; }"
-  - location /meshviewer {
-              alias {{meshviewer_install_directory}};
-              try_files $uri $uri/ =404;
-              gzip on;
-              gzip_comp_level 2;
-              gzip_types application/json application/javascript text/css;
-              gzip_vary on;
-      }
-  - location /data {
-              proxy_pass http://127.0.0.1:8080;
-              proxy_redirect off;
-              gzip on;
-              gzip_comp_level 2;
-              gzip_types application/json;
-              gzip_vary on;
-      }
-  - location /grafana {
-      if ($scheme != "https") {
-        rewrite ^ https://map.ffdo.de$request_uri permanent;
-      }
-                include proxy_params;
-                proxy_pass http://127.0.0.1:3000/;
-                rewrite  ^/grafana/(.*)  /$1 break;
-                proxy_set_header Host $host;
-
-      }

+ 0 - 37
inventories/ffdo/group_vars/mapservers/ssl.yml

@@ -1,37 +0,0 @@
-
-mapserver_ssl_key_path: /etc/nginx/ssl/wiki.ffdo.de.key
-mapserver_ssl_cert_path: /etc/nginx/ssl/wiki.ffdo.de.crt
-mapserver_use_pregenerated_dh_params: false
-mapserver_ssl_private_key: |
-    -----BEGIN RSA PRIVATE KEY-----
-    MIICXQIBAAKBgQDFUvdXLyZGjceI3Z4UjqNrbL1Jn2F/CmCjs4a8x1FqMKaH3G/4
-    se/+soMUC140RqOnb8JrOCxpB0OdepVLDW191X2d4oiOb1fCO2uMBFJ8a1ZEHq/j
-    qLn8RY7OrJGUCMmLsLqmEU6rjAEBvkD2RPTJ8fcUaMXjlIdA05QFgUlAKQIDAQAB
-    AoGBAKSwbDNd7MoyBvlaTlfF/Orp5MoPteW8GZBHhAsHKBJC7Jq0BthAWpfvEaun
-    GUb0Nh7HDjNCvP4jy/EhoHz1hg1pFOkRUlz602qLj5h2aEqB8yW4DfUbrfq3CHpd
-    0rZXWlrIn9Ww0rr/ZGQvNywOuyIVsaDmBWsudQhv+4CSpa/JAkEA+HJCRuAFExHK
-    Lftr/8bSVajOFPmdf+vhERLuAB8r7FH2pl7H67CETKN8BdVLCOurhjSA4Iq/RRaS
-    3qSkXgD9PwJBAMtSzkXfRBPxZl7iCGHsGenOfIdLONm4/LaSBJtsqv3YgAMhMdrO
-    idwU293nKktTONUV61gzbFSbLATiuLH0IJcCQG1TojScCb+deXGIjLrOG+qT0LPM
-    L/GFs9GWmeK11Nc2LiqB1MmzMFSlMENE27L+Oclhu0CT7Z0SVOjiXG39U3MCQQCS
-    6kuIK3KqomShLNx3vT1gN0a+D/mNQODCHzJbCCNp9xVQrZyziUgOEbhpWE60TPck
-    6Yi7m7SsUc913EkutMMTAkBup3dbKPkDgl3Ujm9q/mvyJdE5ZF1QvbSSuFFPinP6
-    pQtvUENWV3NmlAuBOg4gzJ+ZSyKy93KvJ91MHNwfKMok
-    -----END RSA PRIVATE KEY-----
-
-mapserver_ssl_server_cert: |
-    -----BEGIN CERTIFICATE-----
-    MIICazCCAdQCCQDGN/3zHbvn2zANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJE
-    RTEMMAoGA1UECAwDTlJXMREwDwYDVQQHDAhEb3J0bXVuZDERMA8GA1UECgwIRnJl
-    aWZ1bmsxEjAQBgNVBAsMCW1hcHNlcnZlcjEjMCEGA1UEAwwabWFwc2VydmVyLmZy
-    ZWlmdW5rLmV4YW1wbGUwHhcNMTUwODAyMTIzMjUyWhcNMTYwODAxMTIzMjUyWjB6
-    MQswCQYDVQQGEwJERTEMMAoGA1UECAwDTlJXMREwDwYDVQQHDAhEb3J0bXVuZDER
-    MA8GA1UECgwIRnJlaWZ1bmsxEjAQBgNVBAsMCW1hcHNlcnZlcjEjMCEGA1UEAwwa
-    bWFwc2VydmVyLmZyZWlmdW5rLmV4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-    MIGJAoGBAMVS91cvJkaNx4jdnhSOo2tsvUmfYX8KYKOzhrzHUWowpofcb/ix7/6y
-    gxQLXjRGo6dvwms4LGkHQ516lUsNbX3VfZ3iiI5vV8I7a4wEUnxrVkQer+OoufxF
-    js6skZQIyYuwuqYRTquMAQG+QPZE9Mnx9xRoxeOUh0DTlAWBSUApAgMBAAEwDQYJ
-    KoZIhvcNAQELBQADgYEAXjdHDXdzIrlKfk1NN9PdZVap9QrXdxko48r2fxw56EIm
-    86gQheAMJX/kVKPAXnAsvr0Deoj6iM9MhHztDyZUJ4FMSyIteGFOddEVmQ8JCJIo
-    RnAOI4YIB9+CxjXNatDlmGSHGx5i4A2dUUIU/IGPXTe17+4DznGujze/hB04r34=
-    -----END CERTIFICATE-----

+ 0 - 5
inventories/ffdo/group_vars/supernodes/fastd_secrets.yml

@@ -1,5 +0,0 @@
-fastd_instances_secret:
-  - name: do00
-    secret: 280088c4263359417e9f2daf1771db820ab79eb4f79e3718719b2a976e8a8b5e
-  - name: do01
-    secret: 280088c4263359417e9f2daf1771db820ab79eb4f79e3718719b2a976e8a8b5e

+ 0 - 4
inventories/ffdo/host_vars/map.ffdo.de/mesh.yml

@@ -1,4 +0,0 @@
-mesh_mac: 00:16:3e:07:46:d1
-bat_mac: 00:16:3e:27:8f:11
-mesh_ipv4: 10.42.0.1/16
-mesh_ipv6: fdec:16a3:681b:865c::1/64

+ 0 - 2
inventories/ffdo/host_vars/snode01-1.ffdo.de/dhcp.yml

@@ -1,2 +0,0 @@
-dhcp_range_start: 10.42.9.1
-dhcp_range_end: 10.42.15.254

+ 0 - 4
inventories/ffdo/host_vars/snode01-1.ffdo.de/mesh.yml

@@ -1,4 +0,0 @@
-mesh_mac: 00:16:3e:7f:3b:9e
-bat_mac: 00:16:3e:04:49:a2
-mesh_ipv4: 10.42.8.1/16
-mesh_ipv6: fdec:16a3:681b:865c::8/64

+ 0 - 21
inventories/ffdo/host_vars/snode01-1.ffdo.de/peering.yml

@@ -1,21 +0,0 @@
-peers:
-  - name: ffrg-25
-    as: '65079'
-    source_ip4: 10.0.6.2
-    peer_ip4: 10.0.6.1
-    source_ip6: 2a03:2260:50:5a::2
-    peer_ip6: 2a03:2260:50:5a::1
-    gre:
-      ip: 10.0.6.2/30
-      ip6: 2a03:2260:50:5a::2/64
-      endpoint: 5.39.121.115
-  - name: ffrg11
-    as: '65079'
-    source_ip4: 10.0.6.6
-    peer_ip4: 10.0.6.5
-    source_ip6: 2a03:2260:50:5b::2
-    peer_ip6: 2a03:2260:50:5b::1
-    gre:
-      ip: 10.0.6.6/30
-      ip6: 2a03:2260:50:5b::2/64
-      endpoint: 85.14.244.128

+ 0 - 2
inventories/ffdo/host_vars/snode01-2.ffdo.de/dhcp.yml

@@ -1,2 +0,0 @@
-dhcp_range_start: 10.42.25.1
-dhcp_range_end: 10.42.31.254

+ 0 - 4
inventories/ffdo/host_vars/snode01-2.ffdo.de/mesh.yml

@@ -1,4 +0,0 @@
-mesh_mac: 00:16:3e:2d:30:c6
-bat_mac: 00:16:3e:33:6a:1f
-mesh_ipv4: 10.42.24.1/16
-mesh_ipv6: fdec:16a3:681b:865c::24/64

+ 0 - 2
inventories/ffdo/host_vars/snode02-1.ffdo.de/dhcp.yml

@@ -1,2 +0,0 @@
-dhcp_range_start: 10.42.17.1
-dhcp_range_end: 10.42.23.254

+ 0 - 4
inventories/ffdo/host_vars/snode02-1.ffdo.de/mesh.yml

@@ -1,4 +0,0 @@
-mesh_mac: 00:16:3e:22:e1:93
-bat_mac: 00:16:3e:17:85:15
-mesh_ipv4: 10.42.16.1/16
-mesh_ipv6: fdec:16a3:681b:865c::16/64

+ 0 - 21
inventories/ffdo/host_vars/snode02-1.ffdo.de/peering.yml

@@ -1,21 +0,0 @@
-peers:
-  - name: ffrg25
-    as: '65079'
-    source_ip4: 10.0.6.10
-    peer_ip4: 10.0.6.9
-    source_ip6: 2a03:2260:50:5c::2
-    peer_ip6: 2a03:2260:50:5c::1
-    gre:
-      ip: 10.0.6.10/30
-      ip6: 2a03:2260:50:5c::2/64
-      endpoint: 5.39.121.115
-  - name: ffrg11
-    as: '65079'
-    source_ip4: 10.0.6.14
-    peer_ip4: 10.0.6.13
-    source_ip6: 2a03:2260:50:5d::2
-    peer_ip6: 2a03:2260:50:5d::1
-    gre:
-      ip: 10.0.6.14/30
-      ip6: 2a03:2260:50:5d::2/64
-      endpoint: 85.14.244.128

+ 0 - 2
inventories/ffdo/host_vars/snode02-2.ffdo.de/dhcp.yml

@@ -1,2 +0,0 @@
-dhcp_range_start: 10.42.33.1
-dhcp_range_end: 10.42.39.254

+ 0 - 4
inventories/ffdo/host_vars/snode02-2.ffdo.de/mesh.yml

@@ -1,4 +0,0 @@
-mesh_mac: 00:16:3e:06:8e:ce
-bat_mac: 00:16:3e:16:3c:54
-mesh_ipv4: 10.42.32.1/16
-mesh_ipv6: fdec:16a3:681b:865c::32/64

+ 0 - 8
inventories/ffdo/hosts

@@ -1,8 +0,0 @@
-[supernodes]
-snode01-1.ffdo.de
-snode01-2.ffdo.de
-snode02-1.ffdo.de
-snode02-2.ffdo.de
-
-[mapservers]
-map.ffdo.de