Commit Graph

271 Commits

Author SHA1 Message Date
50445edb79 scripts: Move copyusers.py to scripts folder
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 14:53:34 +01:00
ece82c44f4 routertools: Remove direct references to mysql cursor
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 14:50:16 +01:00
bf1d1b8b2a router.html: Fix long loading times
The mysql queries had been executed in a for loop, this is
moved to a single query now.

Side effect may be a little more JavaScript execution time.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 14:44:28 +01:00
b89468d655 Update README to include changes due to MySQL and python3
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:09:14 +01:00
60501ac775 router.html: Fix omitting coordinates if not set
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:07:31 +01:00
9d167bdb86 Respect case in database and code
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:06:25 +01:00
003fcbcebe routertools/stattools: Implement default hood as str "Default"
If the default is NULL (as previously), we have ugly problems
with indexing and queries. To circumvent this, the hood is
set to "Default" right at the beginning.

For old data, we add an if to the hood stats calculation.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:05:48 +01:00
48cb9f0033 routertools: Remove lower() for hood name
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:04:47 +01:00
3be0cd12b3 helpers: Treat spaces in query string more correctly
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:04:09 +01:00
a16c50124c Reintroduce regex for search strings in router list
Includes tidying-up query string helpers

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:03:40 +01:00
92cd0e00a8 routertools: Treat missing XML elements better
This particularly fixes the case of missing coordinates.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:02:03 +01:00
e34daa118d Migrate TileStache to python3
Requires TileStache to be in absolute path

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:01:49 +01:00
9a32c7bffd Delete old router events
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:01:26 +01:00
5262a4e14f Provide fffconfig output option for routers
If ?fffconfig is specified after a routers ID, a config file
with the router's data is return. This can directly be copied
to /etc/config/fff on the device and thus easily recover a
lost configuration.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:01:18 +01:00
412203a946 api: Add wifianalall (all hoods)
Puts reused code into a helper function

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:01:01 +01:00
87093a9066 Add hood-specific statistics
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:00:48 +01:00
e3fe995407 MySQL: alpha3
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-11-16 00:00:07 +01:00
Dominik Heidler
1b4ae0fe51 Merge pull request #75 from adridolf/mapv2
fff-map: Add layer for KeyExchange v2
2017-10-16 12:10:00 +02:00
78a8a1b65e fff-map: Add layer for KeyExchange v2
Draft version. On my local setup, I had to create CSVs manually
with mkcsv.py and copy them to /var/...

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-10-16 12:07:34 +02:00
Dominik Heidler
870785ede8 Merge pull request #74 from adridolf/ulalink
Use ULA for WebUI link
2017-10-14 16:47:04 +02:00
Dominik Heidler
e11be0be71 Merge pull request #73 from adridolf/fixfirmware
No legacy anymore: Fix missing firmware
2017-10-14 16:44:56 +02:00
3d4d005a17 Use ULA for WebUI link
For v2-hoods, the ULA should be used, which enables routing across
hoods.

Fixes #72

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-10-14 15:11:56 +02:00
88e040af00 No legacy anymore: Fix missing firmware
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-10-14 14:59:37 +02:00
Dominik Heidler
547416ae9c No legacy anymore 2017-10-07 23:07:04 +02:00
Dominik Heidler
058bed9a2e Implement loadavg graph data collection for #55 2017-09-11 16:31:57 +02:00
Dominik Heidler
35625fce59 Merge pull request #68 from adridolf/loadavg
Add loadavg graph for routers
2017-09-11 11:55:10 +02:00
fc4e4f3026 Add loadavg graph for routers
Fixes #55

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-09-10 12:24:36 +02:00
Dominik Heidler
f51d0ae5fd Add index for "created" routerdb field (fixes #65) 2017-08-31 13:16:56 +02:00
Dominik Heidler
f8c5913ad1 Commit unstaged changes from production instance 2017-08-21 11:49:26 +02:00
Dominik Heidler
7a54995b69 Merge pull request #64 from adridolf/apipage
Add explanation page for API functions
2017-08-19 09:43:18 +02:00
bd855abd0d Add explanation page for API functions
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-19 02:52:10 +02:00
Dominik Heidler
ff544a4252 Merge pull request #62 from adridolf/routerlist
Add API script to output JSON list of routers with MAC address
2017-08-18 15:08:26 +02:00
b013533dfe Add API script to output JSON list of routers with MAC address
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-18 14:38:57 +02:00
Dominik Heidler
617e6ff4f8 Merge branch 'adridolf-wifianalyzer' 2017-08-18 14:24:35 +02:00
Dominik Heidler
8f7a55042a Fix code style 2017-08-18 14:24:20 +02:00
5f65d38908 Add WifiAnalyzer alias file output
Syntax: /api/wifianal/<hood>

This returns raw text.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-18 13:20:47 +02:00
Dominik Heidler
1b1c8f5129 Merge pull request #63 from adridolf/space2tab
Harmonize tab style in api.py
2017-08-18 00:03:50 +02:00
2a3cd94619 Harmonize tab style in api.py
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-08-17 23:36:06 +02:00
Dominik Heidler
5fb3a562ec Update README.md 2017-08-02 21:50:19 +02:00
Dominik Heidler
8ec440282c Update README.md 2017-08-02 20:40:38 +02:00
Dominik Heidler
96a8466e7a Merge pull request #58 from adridolf/consistent_hoodnames
Make capitalization and spelling of hoods consistent
2017-07-25 10:51:19 +02:00
Dominik Heidler
e4c0a8148f Merge pull request #59 from ChristianDresel/patch-9
Projekt Hoodteilung extremo #9
2017-07-25 10:49:15 +02:00
Christian Dresel
216b0ec801 Projekt Hoodteilung extremo #9
Add Hood Erlenbach
2017-07-25 09:20:24 +02:00
46dbde5c72 Make capitalization and spelling of hoods consistent
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2017-07-24 23:49:07 +02:00
Dominik Heidler
80a7be89a0 Merge pull request #57 from ChristianDresel/patch-8
Projekt Hoodteilung extremo #8
2017-07-21 09:18:22 +02:00
Christian Dresel
a3115c54d0 Projekt Hoodteilung extremo #8
Add Hood Coburg
2017-07-20 18:16:03 +02:00
Dominik Heidler
976e7f735b Merge pull request #56 from ChristianDresel/patch-7
Projekt Hoodteilung extremo #7
2017-07-20 15:30:40 +02:00
Christian Dresel
db4cd7d57f Projekt Hoodteilung extremo #7
Add Hood Lauf
2017-07-20 15:16:38 +02:00
Dominik Heidler
cc4ec82368 Merge pull request #54 from ChristianDresel/patch-6
Projekt Hoodteilung extremo #6
2017-07-19 17:13:43 +02:00
Christian Dresel
a1e7cf2650 Projekt Hoodteilung extremo #6
Add Hood Ebern
Re-positioned Hood Aschaffenburg
2017-07-19 17:10:17 +02:00