Merge branch 'experimental'

master v0.9
Thomas Hooge 2017-07-23 11:09:57 +02:00
commit e35d11bae1
5 changed files with 34 additions and 23 deletions

3
README
View File

@ -1,2 +1,5 @@
Freifunk Community Pinneberg
Site-Konfiguration "site-ffpi"
Dieses ist der Stable-Branch.

View File

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: FFPI 1.1\n"
"PO-Revision-Date: 2016-10-20 19:32+0100\n"
"Project-Id-Version: FFPI 1.2\n"
"PO-Revision-Date: 2017-07-23 11:06+0100\n"
"Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
"Language-Team: German\n"
"Language: de\n"
@ -58,3 +58,6 @@ msgstr "Knoten für Dienste"
msgid "gluon-luci-node-role:role:test"
msgstr "Knoten für Tests"
msgid "gluon-luci-node-role:role:hidden"
msgstr "Unsichtbarer Knoten"

View File

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: FFPI 1.1\n"
"PO-Revision-Date: 2016-10-20 19:32+0100\n"
"Project-Id-Version: FFPI 1.2\n"
"PO-Revision-Date: 2017-07-23 11:06+0100\n"
"Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
"Language-Team: English\n"
"Language: en\n"
@ -54,3 +54,6 @@ msgstr "Service Node"
msgid "gluon-luci-node-role:role:test"
msgstr "Test Node"
msgid "gluon-luci-node-role:role:hidden"
msgstr "Hidden Node"

View File

@ -23,24 +23,24 @@
ssid = '0a:00:ba:dc:ab:1e',
bssid = '0a:00:ba:dc:ab:1e',
mcast_rate = 12000
},
}
},
wifi5 = {
channel = 40,
htmode = 'HT40+',
master = {
ap = {
ssid = 'pinneberg.freifunk.net',
},
ibss = {
ssid = '0a:00:ba:dc:ab:1e',
bssid = '0a:00:ba:dc:ab:1e',
mcast_rate = 12000,
},
}
},
next_node = {
ip4 = '10.137.0.1',
ip6 = 'fde8:21c6:9d82::1',
mac = '16:41:95:40:f7:dc',
mac = '16:41:95:40:f7:dc'
},
fastd_mesh_vpn = {
methods = {'salsa2012+umac'},
@ -78,15 +78,15 @@
'ipv4 "gate05.hoogi.de" port 10000',
'ipv4 "gate05.pinneberg.freifunk.net" port 10000',
'ipv4 "gate05.freifunk-pinneberg.de" port 10000'
},
},
},
},
}
}
}
}
},
bandwidth_limit = {
enabled = false,
limit_ingress = 3000,
limit_egress = 200,
limit_egress = 200
}
},
autoupdater = {
@ -101,7 +101,7 @@
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
},
}
},
beta = {
name = 'beta',
@ -113,7 +113,7 @@
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
},
}
},
experimental = {
name = 'experimental',
@ -125,9 +125,9 @@
'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
},
},
},
}
}
}
},
roles = {
default = 'node',
@ -138,6 +138,7 @@
'offloader',
'service',
'test',
'hidden'
},
},
}

11
site.mk
View File

@ -78,7 +78,7 @@ GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC)
GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC)
GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
@ -103,14 +103,15 @@ GLUON_SITE_PACKAGES += \
$(USB_PACKAGES_STORAGE)
endif
DEFAULT_GLUON_RELEASE := 0.8
DEFAULT_GLUON_RELEASE := 0.9
# Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
GLUON_PRIORITY ?= 0
GLUON_LANGS ?= en de
GLUON_REGION ?= eu
# Enable autoupdater
export GLUON_BRANCH := stable
GLUON_ATH10K_MESH ?= ibss
GLUON_LANGS ?= en de