freifunk-franken
/
firmware
9
7
Fork 13
Code Issues 48 Pull Requests 7 Releases 17 Wiki Activity

node-fff-hoods: Make keyserverurl configurable #236

Closed
rohammer wants to merge 1 commits from rohammer:config-keyserver into master
pull from: rohammer:config-keyserver
merge into: freifunk-franken:master
Conversation 11 Commits 1 Files Changed 2 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
View File

@ -2,4 +2,7 @@
ln -s "$hoodfilewww" /www/hood/keyxchangev2data
uci set fff.keyserver='hood'
uci commit fff
exit 0

2
src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile
View File

@ -99,7 +99,7 @@ getKeyserverHoodfile() {
echo "Getting hoodfile from Keyserver"
if /bin/busybox wget -T15 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then
if /bin/busybox wget -T15 -O "$file" "$(uci -q get fff.keyserver.url || echo "http://keyserver.freifunk-franken.de/v2")/?lat=$lat&long=$long"; then
return 0
else
return 1