Change to config structure for multiple sites. Merge site ffhh-sued to master branch
This commit is contained in:
bdobe
parent
2c22d01c85
commit
1fac91557f
11 changed files with 224 additions and 11 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1 +1,4 @@
|
|||
*~
|
||||
/site.conf
|
||||
/site.mk
|
||||
/modules
|
||||
|
|
|
|||
18
Makefile
Normal file
18
Makefile
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
all: check_site site.mk site.conf modules
|
||||
|
||||
.PHONY: check_site
|
||||
check_site:
|
||||
if test -z "${SITE}"; then echo Usage: make SITE=ffhh; exit 1; else true; fi
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -f site.mk site.conf modules
|
||||
|
||||
modules:
|
||||
cp sites/${SITE}/$@ $@
|
||||
|
||||
site.conf:
|
||||
cp sites/${SITE}/$@ $@
|
||||
|
||||
site.mk:
|
||||
cp sites/${SITE}/$@ $@
|
||||
|
|
@ -3,6 +3,9 @@
|
|||
git clone https://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository
|
||||
cd gluon
|
||||
git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository
|
||||
cd site
|
||||
make SITE=ffhh
|
||||
cd ..
|
||||
make update # Get other repositories used by Gluon
|
||||
make # Build Gluon
|
||||
|
||||
|
|
@ -11,6 +14,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
|
|||
|
||||
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
|
||||
|
||||
- 0.8.2: v2016.2.5
|
||||
- 0.8.1: v2016.2.4 (ffhh-sued only)
|
||||
- 0.8: v2016.1.4
|
||||
- 0.7.1: v2015.1.2
|
||||
- 0.7: v2015.1
|
||||
|
|
|
|||
12
i18n/de.po
12
i18n/de.po
|
|
@ -22,10 +22,10 @@ msgstr ""
|
|||
"<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "
|
||||
"er auf den Servern des Hamburger Freifunk-Projektes eingetragen wurde, "
|
||||
"kann sich dein Knoten mit dem Hamburger Mesh-VPN verbinden. "
|
||||
"Bitte trage dazu diesen Schlüssel, den Namen deines Knotens (<em><%=escape(hostname)%></em>) und ein paar andere Informationen unter "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=escape(hostname)%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> ein.</p>"
|
||||
"Bitte trage dazu diesen Schlüssel, den Namen deines Knotens (<em><%=pcdata(hostname)%></em>) und ein paar andere Informationen unter "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> ein.</p>"
|
||||
"<div class=\"the-key\">"
|
||||
" # <%= escape(hostname) %>"
|
||||
" # <%= pcdata(hostname) %>"
|
||||
" <br/>"
|
||||
"<%= pubkey %>"
|
||||
"</div>"
|
||||
|
|
@ -39,9 +39,9 @@ msgstr ""
|
|||
"<a href=\"https://hamburg.freifunk.net/\">unserer Webseite</a>.</p>"
|
||||
"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
|
||||
|
||||
msgid "gluon-config-mode:nopubkey"
|
||||
msgid "gluon-config-mode:novpn"
|
||||
msgstr ""
|
||||
"Bitte trage nun den Namen deines Knotens "
|
||||
"(<em><%=escape(hostname)%></em>) und ein paar andere Informationen unter "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=escape(hostname)%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> "
|
||||
"(<em><%=pcdata(hostname)%></em>) und ein paar andere Informationen unter "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> "
|
||||
"ein."
|
||||
|
|
|
|||
10
i18n/en.po
10
i18n/en.po
|
|
@ -24,10 +24,10 @@ msgstr ""
|
|||
"<p>This is the public key for your Freifunk node. You can only "
|
||||
"connect the node to the Hamburg mesh VPN after the key has been registered on "
|
||||
"the Freifunk Hamburg servers. "
|
||||
"Please register your key, the name of your node (<em><%=escape(hostname)%></em>), and a bit of additional info at "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=escape(hostname)%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a>.</p>"
|
||||
"Please register your key, the name of your node (<em><%=pcdata(hostname)%></em>), and a bit of additional info at "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a>.</p>"
|
||||
"<div class=\"the-key\">"
|
||||
" # <%= escape(hostname) %>"
|
||||
" # <%= pcdata(hostname) %>"
|
||||
" <br/>"
|
||||
"<%= pubkey %>"
|
||||
"</div>"
|
||||
|
|
@ -40,9 +40,9 @@ msgstr ""
|
|||
"<a href=\"https://hamburg.freifunk.net/\">our homepage</a>.</p>"
|
||||
"<p>Have fun with your node and exploring the Freifunk network!</p>"
|
||||
|
||||
msgid "gluon-config-mode:nopubkey"
|
||||
msgid "gluon-config-mode:novpn"
|
||||
msgstr ""
|
||||
"Please enter the name of your node "
|
||||
"(<em><%=hostname%></em>) and some additional information at "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=escape(hostname)%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> "
|
||||
"<a href=\"https://formular.hamburg.freifunk.net/#/new?hostname=<%=pcdata(hostname)%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">https://formular.hamburg.freifunk.net/</a> "
|
||||
"."
|
||||
|
|
|
|||
5
sites/ffhh-sued/modules
Normal file
5
sites/ffhh-sued/modules
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
GLUON_SITE_FEEDS='ffhh_packages'
|
||||
|
||||
PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
|
||||
PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
|
||||
|
||||
139
sites/ffhh-sued/site.conf
Normal file
139
sites/ffhh-sued/site.conf
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
{
|
||||
hostname_prefix = 'GibMirEinenNamen',
|
||||
site_name = 'Freifunk Hamburg Sued',
|
||||
site_code = 'ffhh-sued',
|
||||
|
||||
opkg = {
|
||||
lede = 'http://opkg.services.ffhh/lede/snapshots/packages/%A',
|
||||
extra = {
|
||||
modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
|
||||
},
|
||||
},
|
||||
|
||||
prefix4 = '10.112.64.0/19',
|
||||
prefix6 = '2a03:2267:1::/64',
|
||||
|
||||
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
|
||||
ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
|
||||
regdom = 'DE',
|
||||
|
||||
wifi24 = {
|
||||
channel = 1,
|
||||
|
||||
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
|
||||
basic_rate = {6000, 9000, 18000, 36000, 54000},
|
||||
|
||||
ap = {
|
||||
ssid = 'hamburg.freifunk.net',
|
||||
},
|
||||
mesh = {
|
||||
id = '6668682D73756564',
|
||||
mcast_rate = 12000,
|
||||
},
|
||||
},
|
||||
|
||||
wifi5 = {
|
||||
channel = 44,
|
||||
ap = {
|
||||
ssid = 'hamburg.freifunk.net',
|
||||
},
|
||||
mesh = {
|
||||
id = '6668682D73756564',
|
||||
mcast_rate = 12000,
|
||||
},
|
||||
},
|
||||
|
||||
next_node = {
|
||||
ip4 = '10.112.64.1',
|
||||
ip6 = '2a03:2267:1::1',
|
||||
|
||||
mac = '16:41:95:40:f7:dc',
|
||||
},
|
||||
|
||||
mesh_vpn = {
|
||||
enabled = true,
|
||||
mtu = 1312,
|
||||
fastd = {
|
||||
configurable = true,
|
||||
methods = {'salsa2012+umac'},
|
||||
groups = {
|
||||
backbone = {
|
||||
limit = 1,
|
||||
peers = {
|
||||
gateway01 = {
|
||||
key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
|
||||
remotes = {'"gw01-new.hamburg.freifunk.net" port 10003'},
|
||||
},
|
||||
gateway02 = {
|
||||
key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
|
||||
remotes = {'"gw02-new.hamburg.freifunk.net" port 10003'},
|
||||
},
|
||||
gateway03 = {
|
||||
key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
|
||||
remotes = {'"gw03-new.hamburg.freifunk.net" port 10003'},
|
||||
},
|
||||
gateway04 = {
|
||||
key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
|
||||
remotes = {'"gw04-new.hamburg.freifunk.net" port 10004'},
|
||||
},
|
||||
gateway05 = {
|
||||
key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5',
|
||||
remotes = {'"gw05-new.hamburg.freifunk.net" port 10004'},
|
||||
},
|
||||
gateway06 = {
|
||||
key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6',
|
||||
remotes = {'"gw06-new.hamburg.freifunk.net" port 10004'},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
bandwidth_limit = {
|
||||
enabled = false,
|
||||
ingress = 8096,
|
||||
egress = 1024,
|
||||
},
|
||||
},
|
||||
|
||||
autoupdater = {
|
||||
branch = 'experimental',
|
||||
branches = {
|
||||
stable = {
|
||||
name = 'stable',
|
||||
mirrors = {'http://1.updates.services.ffhh/ffhh-sued/stable/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/stable/sysupgrade'},
|
||||
good_signatures = 2,
|
||||
pubkeys = {
|
||||
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
|
||||
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
|
||||
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
|
||||
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
|
||||
'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
|
||||
'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
|
||||
},
|
||||
},
|
||||
beta = {
|
||||
name = 'beta',
|
||||
mirrors = {'http://1.updates.services.ffhh/ffhh-sued/beta/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/beta/sysupgrade'},
|
||||
good_signatures = 2,
|
||||
pubkeys = {
|
||||
'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
|
||||
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
|
||||
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
|
||||
'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
|
||||
'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
|
||||
'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
|
||||
},
|
||||
},
|
||||
experimental = {
|
||||
name = 'experimental',
|
||||
mirrors = {'http://1.updates.services.ffhh/ffhh-sued/experimental/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/experimental/sysupgrade'},
|
||||
good_signatures = 1,
|
||||
pubkeys = {
|
||||
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
poe_passthrough = false,
|
||||
}
|
||||
38
sites/ffhh-sued/site.mk
Normal file
38
sites/ffhh-sued/site.mk
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
GLUON_SITE_PACKAGES := \
|
||||
gluon-mesh-batman-adv-15 \
|
||||
gluon-autoupdater \
|
||||
gluon-config-mode-autoupdater \
|
||||
gluon-config-mode-core \
|
||||
gluon-config-mode-hostname \
|
||||
gluon-config-mode-mesh-vpn \
|
||||
gluon-ebtables-filter-multicast \
|
||||
gluon-ebtables-filter-ra-dhcp \
|
||||
gluon-ebtables-segment-mld \
|
||||
gluon-web-admin \
|
||||
gluon-web-autoupdater \
|
||||
gluon-web-network \
|
||||
gluon-web-private-wifi \
|
||||
gluon-web-wifi-config \
|
||||
gluon-mesh-vpn-fastd \
|
||||
gluon-radvd \
|
||||
gluon-respondd \
|
||||
gluon-setup-mode \
|
||||
gluon-status-page \
|
||||
iwinfo \
|
||||
iptables \
|
||||
haveged
|
||||
|
||||
|
||||
DEFAULT_GLUON_RELEASE := 0.9~exp$(shell date '+%Y%m%d')
|
||||
|
||||
# Allow overriding the release number from the command line
|
||||
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
|
||||
|
||||
GLUON_PRIORITY ?= 0
|
||||
|
||||
# Region code required for some images; supported values: us eu
|
||||
GLUON_REGION ?= eu
|
||||
|
||||
GLUON_ATH10K_MESH ?= 11s
|
||||
|
||||
GLUON_LANGS ?= en de
|
||||
5
sites/ffhh/modules
Normal file
5
sites/ffhh/modules
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
GLUON_SITE_FEEDS='ffhh_packages'
|
||||
|
||||
PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
|
||||
PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
|
||||
|
||||
Loading…
Reference in a new issue