add breminale spezifisch + wifictld
This commit is contained in:
parent
f4d8f78a6c
commit
925e88996c
|
|
@ -1,3 +1,3 @@
|
||||||
[submodule "gluon"]
|
[submodule "gluon"]
|
||||||
path = gluon
|
path = gluon
|
||||||
url = https://github.com/freifunk-gluon/gluon.git
|
url = https://github.com/FreifunkBremen/gluon.git
|
||||||
|
|
|
||||||
6
build.sh
6
build.sh
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
# environmental and build settings
|
# environmental and build settings
|
||||||
KEYFILE="${KEYFILE:-"$HOME/.ecdsakey"}"
|
KEYFILE="${KEYFILE:-"$HOME/.ecdsakey"}"
|
||||||
|
export BROKEN=1
|
||||||
|
GLUON_TARGETS="${GLUON_TARGETS:-"ar71xx-generic ar71xx-nand mpc85xx-generic x86-generic x86-64 ramips-mt7621"}"
|
||||||
GLUON_PRIORITY="${GLUON_PRIORITY:-7}"
|
GLUON_PRIORITY="${GLUON_PRIORITY:-7}"
|
||||||
|
|
||||||
# start of script
|
# start of script
|
||||||
|
|
@ -26,8 +28,8 @@ fi
|
||||||
for target in $GLUON_TARGETS; do
|
for target in $GLUON_TARGETS; do
|
||||||
echo "Building target ${target}"
|
echo "Building target ${target}"
|
||||||
schedtool -B -e \
|
schedtool -B -e \
|
||||||
make --jobs=$(grep -c '^processor' /proc/cpuinfo) --output-sync=recurse \
|
make --jobs=$(grep -c '^processor' /proc/cpuinfo) GLUON_TARGET="$target" || \
|
||||||
GLUON_TARGET="$target" V=s
|
make -j1 --output-sync=recurse GLUON_TARGET="$target" V=s
|
||||||
done
|
done
|
||||||
|
|
||||||
# generate manifests
|
# generate manifests
|
||||||
|
|
|
||||||
2
gluon
2
gluon
|
|
@ -1 +1 @@
|
||||||
Subproject commit e968a225be0efafbd2d4638d0bd530e2d4e841f3
|
Subproject commit 4d5ac7608724bf9e425be5ca1b8ead403d3e296b
|
||||||
3
modules
3
modules
|
|
@ -1,4 +1,5 @@
|
||||||
GLUON_SITE_FEEDS='ffhb'
|
GLUON_SITE_FEEDS='ffhb'
|
||||||
|
|
||||||
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
|
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
|
||||||
PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
|
PACKAGES_FFHB_COMMIT=570cadb7d0b5b61140375d53bee11870cd9ff806
|
||||||
|
PACKAGES_FFHB_BRANCH=events
|
||||||
|
|
|
||||||
33
site.conf
33
site.conf
|
|
@ -1,4 +1,17 @@
|
||||||
{
|
{
|
||||||
|
-- breminale spezifisch start
|
||||||
|
authorized_keys = {
|
||||||
|
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDI9U3PPxW4l3vn8D5scxPSo4wwRg/XEntqR9K3upVpkAhLJZ6mxYH8Rx+YBQh6PRPWyalVTrZhbk7OrU9jOQggNeTGebAwkciDwU7GwyPZTlY0ynIu3SAiCyKBWO1mg18zMkTOLb97rDDfxdJeqhAXeXHS8DRNC6mfe9XZIfMclBdqJTuooUSmTLszLYlXjOtYca7wamOVitnjcPOQC06jgqfwoyTknuFm7X39+VkAqpRJtE3TML7eydFy5gMqG+Q4QHkLdSodlBYyBp8T/hYHGmITV9g96+fRtkcSzTOXyHpywh9qt4OjU98RoOJdhxsp4Noolf81Sz25JFGKUiiEVcp1eQ7ai+9++gcq94jHltZuKpiCeUmqdldy/2r59HBGmTc2pu0cJIWlHnku+rNjcdMbuEM16KKomKb2NUu+u/UMg23hyU0JUp7OYABvZeE/fk3q2x2bMPoWI9xHDkvvf4c9FsWeKYoS44ZG7TFUJ8sEGrwWvI5KWw6u1w0l4rYoMxsnQbqmX696WtONQDQqTN9j14fQxq/FXOwsRcIYlZvteEuqrh0GU13dS5MEAg7ZLMk4HUiBrF+nffI8mijp0TQQGcRoZkhoUcK/09qa8+0kqErQoBVJZZ0toCndt79Uigpkp5wq6d3kZPCGwIIdoyrJaG6DyCu2bnqHEbo+SQ== genofire',
|
||||||
|
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxUmPEPY0vbwpKmjlFpke59/32LBDXW5KA+X8D5sYfsuW4vc1ZV4k7MvU62WhwvkJv12X+jVgaV7p9rMPBFLlollgq5X4Jc1QFBTvRC97zLbFDp0QP5MrZQ5TwdbgVb513bMvTOFtdScl9i4a0Y0lgd2xSH41h7NJwxm82VWbOF7lzmsSXpTAI+7IiUENyWJ8TX1HJuMeJk+6vx1tWQUM01rpaCO+EW4bHV0jWzM3JLyAnNzEAobWVBbyNAhVa1PLm7YRP+zxCmL3HU1H1jqIsKG+jkUPRSLXNHxugdh6bmlFf6YaCMCv19tSrwcQQVvWYK9HJsAtkee2tUPiX5FmK/Sh+KH8M1Vao62s7PScJtYX6K3zQuQ7oGrBJy6Rvhxyy8fH3tLmMAiI6DSmE0gXudKIiOesS9SwI1NsdbbXk38EKzKDx/G1xqfjC3wxIlMaTfkeEtquYI8iLCXzOlN58XhA7gCjvFSU0jBrguq8KPZdo6gfs6MSTMbOIs2LdyRjEvcNB0ki8TPmUs9VzDm8n2n7rJjsJvOr/ISl2D0CB0AEYkYrkso5Hhm6ts1DB3eRNx0kjuM5TH9/8XWMVhzXqG3ePWVEMICZSgZQahXjc0h77BWe/lbLEe+c3fYpGipOMEoRElSpG4TOyuA4z5/JjhDphkap2gZHEqg5uWr/G/Q== genofire-fallback',
|
||||||
|
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDEX65ZS3thwv+jkWBDeO6vyPO3I+U0iDIqONDpB5mej192Dy9Grddc6+vfK94JLQYKytIHO/qgFhFwK85EyhAeuzbVJ/cf0g4UDosPIvn64/6hPaLmnfyFwIxXNx2E1UQKYgFvghwAOMSw17mJuImxNZ0PAy7Nw9muWL87kSmfEobMKTFe8KIqVIk5pv332rPWV+ZiRwqs2SfG+0GydqKIFEz9injteJUB/TvlIrbGgF7wj3E+Jd88HytSEie/DNRLmd07AJroGRHHS0aoQw8/1txu2xa+xuT62cJkXyfMIhtzGUJ0tlmNXb/UrcBCQUNMUgQgJXCpxXDujVQSB4thV1Rm8fxxouBxOonGg/HiP7I/ZndfgGGpGjXsD5Cn/i8i5GTePwP9CMPgkZU4BmUkrEcr8fuzCIiRUSzzpQJikOsWj+LfP0xwYIaYS7pOmqF6G2CQ1kVA2gtLjPuvpzadZGiRJ5HBG23bEJ6vgF8zAQIOvJXiOe0dWJh7PZ8XTjOCAUImhtsv6l8I61XOqwnI8QqLF0RVmVIso6jM1lWWugrBpE56suJPBQ5MaxF14weMRkWQjsAIY2fdUdDaqiZuZk8+zA0BDepizz17P/WwkS/mjXytIuYoDf2/rj41MzS+F7c2ligSre6yqqnl0NTHmwsm12csdzyegR4Etwah1Q== freifunkmamager',
|
||||||
|
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC9zJ9JOHWbg6RrH1oN6EtU2FdXVHwTXMM0Ls0395/P5NX7z8YA0WE/CQJ5weeUxGsUq+2k3ZCx+H2jUcmSaoHf+nC+E79aIMtk+EV2qbQsPH/gBvg2cWTAieRdqMVVsI5tNfemIFL4K0MTjS+g7m/Gbm7c5sTtseZcENbJdW/hH8UPeaHLIDCEI+cOXhjgUWO26OXXLRQr07Qnfba58Der1PZ0u4jeGJCBNpdVSjkipR86Mx9Sia+q/Egnhufmy+Bo9zlL5B4VXd7apBeung+rBBBHGg/hMUX6N9hNHyMv5a7/6rw8ei/rIrlfJLcG5jpJ8X2T0dfFjlDL9GLnaDIFuYqmCWt3WrcmImgVnRvmu6f0f+feD0jkSfFqrt9yBAWlC/Etv02NV+oveuNueKyHRgugmFzAwku9wN2HTvnw1jgzZ5tB+GZ/tqrmR9oNgv6CHzp1+RMz7xG9RAFoiCUODIxCR19Xlzi/G0FijmTQFkOtJXRH1w1yXN1I/d+JkjA/SM7XAzgJ7i77Nw/vtZ2ZtopsMK3qpJ7Aozl4h0Zflw+8sdo5pMF+qoBbmgg+Ycx6TvYrtibaiSQZ+z2X8ZJJ82VvDbnbRp7C2xXaFemOd16Ni6jq5vB+X0/rrqcsVHOH9ER/zweKrEEEWjqiImjyJnbHwRTDo9+f8mKsTFGRmQ== breminale2018',
|
||||||
|
},
|
||||||
|
mesh_on_lan = true,
|
||||||
|
poe_passthrough = true,
|
||||||
|
setup_mode = {
|
||||||
|
skip = true,
|
||||||
|
},
|
||||||
|
-- breminale spezifisch ende
|
||||||
site_name = 'Freifunk Bremen',
|
site_name = 'Freifunk Bremen',
|
||||||
site_code = 'ffhb',
|
site_code = 'ffhb',
|
||||||
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
|
domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
|
||||||
|
|
@ -23,11 +36,11 @@
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'bremen.freifunk.net',
|
ssid = 'bremen.freifunk.net',
|
||||||
},
|
},
|
||||||
ibss = {
|
--ibss = {
|
||||||
ssid = 'mesh.ffhb.de',
|
-- ssid = 'mesh.ffhb.de',
|
||||||
bssid = '32:06:1C:1F:B9:E8',
|
-- bssid = '32:06:1C:1F:B9:E8',
|
||||||
mcast_rate = 6000,
|
-- mcast_rate = 6000,
|
||||||
},
|
--},
|
||||||
--mesh = {
|
--mesh = {
|
||||||
-- id = 'mesh.ffhb.de',
|
-- id = 'mesh.ffhb.de',
|
||||||
-- mcast_rate = 6000,
|
-- mcast_rate = 6000,
|
||||||
|
|
@ -38,11 +51,11 @@
|
||||||
ap = {
|
ap = {
|
||||||
ssid = 'bremen.freifunk.net',
|
ssid = 'bremen.freifunk.net',
|
||||||
},
|
},
|
||||||
ibss = {
|
--ibss = {
|
||||||
ssid = 'mesh.ffhb.de',
|
-- ssid = 'mesh.ffhb.de',
|
||||||
bssid = '32:06:1C:1F:B9:E8',
|
-- bssid = '32:06:1C:1F:B9:E8',
|
||||||
mcast_rate = 6000,
|
-- mcast_rate = 6000,
|
||||||
},
|
--},
|
||||||
--mesh = {
|
--mesh = {
|
||||||
-- id = 'mesh.ffhb.de',
|
-- id = 'mesh.ffhb.de',
|
||||||
-- mcast_rate = 6000,
|
-- mcast_rate = 6000,
|
||||||
|
|
|
||||||
12
site.mk
12
site.mk
|
|
@ -27,12 +27,18 @@ GLUON_SITE_PACKAGES := \
|
||||||
iwinfo \
|
iwinfo \
|
||||||
iptables \
|
iptables \
|
||||||
firewall \
|
firewall \
|
||||||
haveged
|
haveged \
|
||||||
|
wifictld \
|
||||||
|
respondd-module-wifictld \
|
||||||
|
gluon-authorized-keys \
|
||||||
|
respondd-module-wifisettings \
|
||||||
|
respondd-module-lldp \
|
||||||
|
reghack
|
||||||
|
|
||||||
# Allow overriding the these variables from the command line
|
# Allow overriding the these variables from the command line
|
||||||
GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
|
GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
|
||||||
export GLUON_BRANCH ?= stable
|
export GLUON_BRANCH ?= breminale
|
||||||
GLUON_PRIORITY ?= 0
|
GLUON_PRIORITY ?= 0
|
||||||
GLUON_LANGS ?= en de
|
GLUON_LANGS ?= en de
|
||||||
GLUON_REGION ?= eu
|
GLUON_REGION ?= eu
|
||||||
GLUON_WLAN_MESH ?= ibss
|
GLUON_WLAN_MESH ?= 11s
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue