Commit 499b3aa9 authored by mray's avatar mray

Merge branch 'master' of git.cccfr.de:fffr/homepage

parents 219f8061 aeca885f
# This file is a template, and might need editing before it works on your project.
# Full project: https://gitlab.com/pages/jekyll
image: ruby:2.3
test:
stage: test
script:
- gem install jekyll
- jekyll build -d test
artifacts:
paths:
- test
except:
- master
pages:
stage: deploy
script:
- gem install jekyll
- jekyll build -d public
artifacts:
paths:
- public
only:
- master
[submodule "de-map"]
path = de-map
url = https://cccfr.de/git/fffr/de-map.git
......@@ -8,7 +8,7 @@
"lon": 7.8257,
"address": {
"Name": "Chaos Computer Club Freiburg",
"Street": "Dunantstr. 16a (Westarkaden)",
"Street": "Dunantstr. 16a (Tram Berliner Allee)",
"Zipcode": "79110"
}
},
......@@ -20,13 +20,13 @@
},
"state": {
"nodes": @nodes@,
"description": "Freifunk Freiburg und Umgebung. Vielfältige Zugänge in der Innenstadt, Jugendeinrichtungen und Flüchtlingsunterkünften. Hilf mit ein engmaschiges Netz aufzubauen indem wir unsere Internetbandbreite Teilen.",
"description": "Freifunk Freiburg und Umgebung. Internet in der Innenstadt, Jugendeinrichtungen und Flüchtlingsunterkünften, im Cafe, in der Kneipe, an der Bushaltestelle und überall... hilf mit ein engmaschiges Netz aufzubauen. Teile Bandbreite und stelle Freifunkrouter auf.",
"focus": [
"infrastructure/backbone",
"Public Free Wifi",
"Free internet access"
],
"lastchange": "2015-12-25T12:55:00.902Z"
"lastchange": "@newdate@"
},
"timeline": [
{
......@@ -36,10 +36,17 @@
],
"nodeMaps": [
{
"url": "https://freiburg.freifunk.net/ffmap-backend",
"url": "https://openfreiburg.de/freifunk",
"interval": "1m",
"technicalType": "meshviewer",
"mapType": "ffmap/backend"
"mapType": "structural"
},
{
"url": "https://openfreiburg.de/freifunk/meshviewer",
"interval": "1m",
"technicalType": "meshviewer",
"mapType": "list/status"
},
{
......@@ -69,6 +76,11 @@
"mapType": "list/status"
}
],
"socialprojects": {
"number": 20,
"website": "https://freiburg.freifunk.net",
"contact": "kontakt@freiburg.freifunk.net"
},
"support": {
"club": {
"name": "Chaos Computer Club Freiburg e.V.",
......@@ -106,6 +118,12 @@
"ipv6": [
{
"network": "fdf0:09bb:7814::/48"
},
{
"network": "2001:bf7:2810:ff42::/64"
},
{
"network": "fdf0:9bb:7814:a630::/64"
}
],
"ipv4": [
......@@ -115,15 +133,18 @@
]
},
"routing": [
"802.11s",
"batman-adv"
],
"updatemode": [
"manual",
"autoupdate"
],
"legals": [
"vpnnational",
"vpninternational",
"institutions"
]
]
},
"api": "0.4.9"
"api": "0.4.12"
}
......@@ -35,10 +35,11 @@ newnumber=$(grep -o '"online": true' ../ffmap-backend/nodelist.json|wc -l)
#
if [ $newnumber -ge 100 -a $newnumber -le 10000 ];
then
sed -e s/@nodes@/$newnumber/g $apilocation > ${apilocation%.in};
sed -e s/@nodes@/$newnumber/g $apilocation > ${apilocation%.in}
# for timestamp update
# TODO expansion to end-of-line in origin-expression is missing
# sed -e s/' "lastchange": '/' "lastchange": "'$(date -I +%Y-%m-%dT%T%Z)'"'/g API-File
sed -i s/@newdate@/$(date +%Y-%m-%dT%T%Z)/g ${apilocation%.in}
fi
#
......
de-map @ e1fde3d2
Subproject commit e1fde3d267edb9ecac09d18a56e0d05e46931780
......@@ -50,10 +50,10 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(bp
<div class="row map">
<div class="ganzekarte">
<a href="https://freiburg.freifunk.net/meshviewer">Detailkarte</a>
<a href="https://freiburg-karte.de/"></a>
<a href="https://openfreiburg.de/freifunk/meshviewer">Detailkarte</a>
<a href="https://freifunk-karte.de/?lat=48.00187&lng=7.8257&z=12&l=Nodes"> @</a>
</div>
<iframe width="999" height="333" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://freiburg.freifunk.net/de-map/?lat=48.00187&lng=7.8257&z=12&l=Nodes"></iframe>
<iframe width="999" height="333" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://www.freifunk-karte.de/?lat=48.00187&lng=7.8257&z=12&l=Nodes"></iframe>
</div>
<div class="content row">
......@@ -198,4 +198,4 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(bp
</div>
</body>
</html>
\ No newline at end of file
</html>
......@@ -43,15 +43,6 @@
],
"mapLayers": [
{ "name": "MapQuest",
"url": "https://otile{s}-s.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg",
"config": {
"subdomains": "1234",
"type": "osm",
"attribution": "Tiles &copy; <a href=\"https://www.mapquest.com/\" target=\"_blank\">MapQuest</a>, Data CC-BY-SA OpenStreetMap",
"maxZoom": 18
}
},
{ "name": "arcgisonline",
"url": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}",
"config": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment