krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

changed the site.conf / site.mk to the most recent version

Browse Source 
fixed vpn fastd server settings
This commit is contained in:
amperpirat
2014-09-30 07:44:56 +02:00
parent e593984de1
commit 2ae2bca194
2 changed files with 66 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
site.conf
View File

@@ -13,7 +13,8 @@
hostname_prefix: Nodename prefix hostname_prefix: Nodename prefix
freifunk-abcdef123456 (hex-part is generated from node's MAC address) freifunk-abcdef123456 (hex-part is generated from node's MAC address)
site_name: Name of your community site_name: Name of your community
site_code: Shortcode of your community ]] site_code: Shortcode of your community
]]
hostname_prefix = 'freifunk', hostname_prefix = 'freifunk',
site_name = 'Freifunk München', site_name = 'Freifunk München',
@@ -119,13 +120,13 @@
backbone = { backbone = {
limit = 2, limit = 2,
peers = { peers = {
vpn_gw01 = { --[[ VPN Server von frnk ]] vpn_gw01 = { --[[ VPN Server von frnk (Island greencloud) ]]
key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101',
remotes = {'46.149.17.144 port 10000'}, remotes = {'ipv4 "46.149.17.144" port 10000'},
}, },
vpn_gw02 = { --[[ VPN Server von Ole (netcap) ]] vpn_gw02 = { --[[ VPN Server von Ole (netcap) ]]
key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3',
remotes = {'37.120.168.150 port 10000'}, remotes = {'ipv4 "37.120.168.150" port 10000'},
}, },
}, },
}, },
@@ -138,23 +139,23 @@
name: name of the branch name: name of the branch
mirrors: comma separated ipv6 based mirror-servers to access the firmware image mirrors: comma separated ipv6 based mirror-servers to access the firmware image
good_signatures: number of at leased good signatures signed by the authors of the firmware good_signatures: number of at leased good signatures signed by the authors of the firmware
pubkeys: public keys of the authors of the firmware image ]] pubkeys: public keys of the authors of the firmware image]]
autoupdater = { autoupdater = {
enabled = 0, enabled = 0,
branch = 'experimental', branch = 'stable',
branches = { branches = {
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = { mirrors = {
'http://{fdca:ffee:babe:1::fec1}/firmware/stable/sysupgrade/', 'http://37.120.168.150/firmware/stable/sysupgrade/',
'http://{fdca:ffee:babe:1::fec2}/firmware/stable/sysupgrade/',
}, },
probability = 0.08, probability = 0.08,
good_signatures = 2, good_signatures = 1,
pubkeys = { pubkeys = {
'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- someguy '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole
'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX', -- someother
}, },
}, },
}, },
@@ -197,7 +198,7 @@
config_mode = { config_mode = {
msg_welcome = [[ msg_welcome = [[
Willkommen zum Einrichtungsassistenten für deinen neuen Münchner Willkommen zum Einrichtungsassistenten für deinen neuen Münchner
Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen
entsprechend aus und sende es ab. entsprechend aus und sende es ab.
]], ]],
@@ -223,3 +224,5 @@ Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!
]], ]],
}, },
} }

19
site.mk
View File

@@ -1,8 +1,3 @@
## gluon site.mk makefile example
## GLUON_SITE_PACKAGES
# specify gluon/openwrt packages to include here
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-14 \ gluon-mesh-batman-adv-14 \
gluon-alfred \ gluon-alfred \
@@ -27,22 +22,8 @@ GLUON_SITE_PACKAGES := \
haveged haveged
## DEFAULT_GLUON_RELEASE
# version string to use for images
# gluon relies on
# opkg compare-versions "$1" '>>' "$2"
# to decide if a version is newer or not.
DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d') DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d')
## GLUON_RELEASE
# call make with custom GLUON_RELEASE flag, to use your own release version scheme.
# e.g.:
# $ make images GLUON_RELEASE=23.42+5
# would generate images named like this:
# gluon-ff%site_code%-23.42+5-%router_model%.bin
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)