[2/2] erlangen json angepasst

Submitted by Mister Crumble on April 9, 2016, 7:11 p.m.

Details

Message ID 1460229070-4470-1-git-send-email-mistercrumble@web.de
State Not Applicable, archived
Headers show

Commit Message

Mister Crumble April 9, 2016, 7:11 p.m. 
From: Christoph <suepke.christoph@gmail.com>

Signed-off-by: Christoph <suepke.christoph@gmail.com>
---
 ...on-angepasst-auf-Monitoring-und-neu-API-V.patch | 179 +++++++++++++++++++++
 erlangen.json                                      |  12 +-
 2 files changed, 185 insertions(+), 6 deletions(-)
 create mode 100644 0001-W-rzburg-Json-angepasst-auf-Monitoring-und-neu-API-V.patch

Patch hide | download patch | download mbox 

diff --git a/0001-W-rzburg-Json-angepasst-auf-Monitoring-und-neu-API-V.patch b/0001-W-rzburg-Json-angepasst-auf-Monitoring-und-neu-API-V.patch
new file mode 100644
index 0000000..2108a02
--- /dev/null
+++ b/0001-W-rzburg-Json-angepasst-auf-Monitoring-und-neu-API-V.patch
@@ -0,0 +1,179 @@ 
+From e1e4fd0d437baea1bc16f3f952a1d156a5327edc Mon Sep 17 00:00:00 2001
+From: Christoph <suepke.christoph@gmail.com>
+Date: Sat, 9 Apr 2016 20:45:31 +0200
+Subject: [PATCH] =?UTF-8?q?W=C3=BCrzburg=20Json=20angepasst=20auf=20Monito?=
+ =?UTF-8?q?ring=20und=20neu=20API=20Version?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Christoph <suepke.christoph@gmail.com>
+---
+ wuerzburg.json | 148 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 74 insertions(+), 74 deletions(-)
+
+diff --git a/wuerzburg.json b/wuerzburg.json
+index 6d88138..bec15a4 100644
+--- a/wuerzburg.json
++++ b/wuerzburg.json
+@@ -1,82 +1,82 @@
+ {
+-    "api": "0.4.8",
+-    "contact": {
+-        "email": "fragen@freifunk-franken.de",
+-        "facebook": "https://www.facebook.com/pages/Freifunk-W%C3%BCrzburg/1551181611834107",
+-        "irc": "irc://irc.freenode.net/#freifunkfranken",
+-        "ml": "http://lists.freifunk.net/mailman/listinfo/franken-freifunk.net",
+-        "phone": "+49 9101 7018607",
+-        "twitter": "@FreifunkFranken"
+-    },
+-    "location": {
+-        "city": "Würzburg",
+-        "country": "DE",
+-        "lat": 49.796880000000002,
+-        "lon": 9.9348899999999993
+-    },
+-    "metacommunity": "Freifunk Franken",
+-    "name": "Freifunk Würzburg",
+-    "networks": {
+-        "ipv4": [
+-            {
+-                "network": "10.50.72.0/21"
+-            }
+-        ]
+-    },
+-    "nodeMaps": [
+-        {
+-            "mapType": "geographical",
+-            "technicalType": "netmon",
+-            "url": "https://netmon.freifunk-franken.de/map.php?zoom=13&lat=49.78524&lon=9.92406&layers=B0000TTTTTT"
+-        },
+-        {
+-            "mapType": "list/status",
+-            "technicalType": "netmon",
+-            "url": "https://netmon.freifunk-franken.de/routerlist.php"
+-        }
++  "name": "Freifunk Würzburg",
++  "url": "http://freifunk-franken.de",
++  "location": {
++    "city": "Würzburg",
++    "country": "DE",
++    "lat": 49.79688,
++    "lon": 9.93489
++  },
++  "contact": {
++    "email": "fragen@freifunk-franken.de",
++    "phone": "+49 9101 7018607",
++    "irc": "irc://irc.freenode.net/#freifunkfranken",
++    "ml": "http://lists.freifunk.net/mailman/listinfo/franken-freifunk.net",
++    "facebook": "https://www.facebook.com/pages/Freifunk-W%C3%BCrzburg/1551181611834107",
++    "twitter": "@FreifunkFranken"
++  },
++  "metacommunity": "Freifunk Franken",
++  "state": {
++    "nodes": 57,
++    "focus": [
++      "infrastructure/backbone",
++      "Public Free Wifi",
++      "Free internet access"
+     ],
+-    "state": {
+-        "focus": [
+-            "infrastructure/backbone",
+-            "Public Free Wifi",
+-            "Free internet access"
+-        ],
+-        "lastchange": "2016-04-09T10:00:18.027195Z",
+-        "nodes": 58
++    "lastchange": "2016-04-09T18:42:03.571Z"
++  },
++  "timeline": [
++    {
++      "description": "20 Router an die Piratenpartei Würzburg übergeben",
++      "timestamp": "2013-07-27"
++    }
++  ],
++  "nodeMaps": [
++    {
++      "url": "https://netmon.freifunk-franken.de/map.php?zoom=13&lat=49.78524&lon=9.92406&layers=B0000TTTTTT",
++      "technicalType": "netmon",
++      "mapType": "geographical"
+     },
+-    "support": {
+-        "donations": {
+-            "campaigns": [
+-                {
+-                    "projectid": "14713",
+-                    "provider": "betterplace"
+-                }
+-            ]
++    {
++      "url": "https://netmon.freifunk-franken.de/routerlist.php",
++      "technicalType": "netmon",
++      "mapType": "list/status"
++    }
++  ],
++  "support": {
++    "donations": {
++      "campaigns": [
++        {
++          "provider": "betterplace",
++          "projectid": "14713"
+         }
++      ]
++    }
++  },
++  "techDetails": {
++    "firmware": {
++      "name": "Freifunk-Franken Firmware",
++      "url": "https://dev.freifunk-franken.de/firmware/",
++      "docs": "https://wiki.freifunk-franken.de/w/Portal:Firmware"
+     },
+-    "techDetails": {
+-        "firmware": {
+-            "docs": "https://wiki.freifunk-franken.de/w/Portal:Firmware",
+-            "name": "Freifunk-Franken Firmware",
+-            "url": "https://dev.freifunk-franken.de/firmware/"
+-        },
+-        "legals": [
+-            "vpnnational",
+-            "vpninternational"
+-        ],
+-        "routing": [
+-            "batman-adv",
+-            "OLSR"
+-        ],
+-        "updatemode": [
+-            "manual"
+-        ]
+-    },
+-    "timeline": [
++    "networks": {
++      "ipv4": [
+         {
+-            "description": "20 Router an die Piratenpartei Würzburg übergeben",
+-            "timestamp": "2013-07-27"
++          "network": "10.50.72.0/21"
+         }
++      ]
++    },
++    "routing": [
++      "batman-adv",
++      "OLSR"
++    ],
++    "updatemode": [
++      "manual"
+     ],
+-    "url": "http://freifunk-franken.de"
+-}
+\ No newline at end of file
++    "legals": [
++      "vpnnational",
++      "vpninternational"
++    ]
++  },
++  "api": "0.4.12"
++}
+-- 
+1.9.1
+
diff --git a/erlangen.json b/erlangen.json
index cbbc917..840f415 100644
--- a/erlangen.json
+++ b/erlangen.json
@@ -3,7 +3,7 @@ 
     "contact": {
         "email": "fragen@freifunk-franken.de",
         "facebook": "https://www.facebook.com/FreifunkFranken",
-        "irc": "irc://irc.freenode.net/#freifunkfranken",
+        "irc": "irc://irc.freenode.net/#freifunk-franken",
         "ml": "http://lists.freifunk.net/mailman/listinfo/franken-freifunk.net",
         "phone": "+49 9101 7018607",
         "twitter": "@FreifunkFranken"
@@ -26,13 +26,13 @@ 
     "nodeMaps": [
         {
             "mapType": "geographical",
-            "technicalType": "netmon",
-            "url": "https://netmon.freifunk-franken.de/map.php?zoom=12&lat=49.59401&lon=11.01177&layers=B0000TTTTTT"
+            "technicalType": "monitoring",
+            "url": "https://monitoring.freifunk-franken.de/map?mapcenter=49.45000,11.10012,11"
         },
         {
             "mapType": "list/status",
-            "technicalType": "netmon",
-            "url": "https://netmon.freifunk-franken.de/routerlist.php"
+            "technicalType": "monitoring",
+            "url": "https://monitoring.freifunk-franken.de/routers"
         }
     ],
     "state": {
@@ -80,4 +80,4 @@ 
         }
     ],
     "url": "http://freifunk-franken.de"
-}
\ No newline at end of file
+}