Merge branch 'for-2016.1'
This commit is contained in:
commit
64cb5aec40
|
@ -3,7 +3,7 @@
|
||||||
Um die Bremer Firmware zu bauen sind folgende Vorbereitungen notwendig:
|
Um die Bremer Firmware zu bauen sind folgende Vorbereitungen notwendig:
|
||||||
```sh
|
```sh
|
||||||
# Build-Dependencies installieren (Debian)
|
# Build-Dependencies installieren (Debian)
|
||||||
sudo apt-get install coreutils build-essential subversion git libncurses5-dev zlib1g-dev unzip gawk
|
sudo apt-get install coreutils build-essential subversion git libncurses5-dev zlib1g-dev unzip gawk libssl-dev
|
||||||
# Dieses und das Gluon-Repository clonen
|
# Dieses und das Gluon-Repository clonen
|
||||||
git clone --recursive https://github.com/FreifunkBremen/gluon-site-ffhb.git
|
git clone --recursive https://github.com/FreifunkBremen/gluon-site-ffhb.git
|
||||||
```
|
```
|
||||||
|
|
2
gluon
2
gluon
|
@ -1 +1 @@
|
||||||
Subproject commit 30677cdc385f44005220ed105619d3a4fa9290ce
|
Subproject commit 55dc9c369d763f4b359070b2628efe46d983e0ec
|
32
site.conf
32
site.conf
|
@ -17,20 +17,36 @@
|
||||||
regdom = 'DE',
|
regdom = 'DE',
|
||||||
|
|
||||||
wifi24 = {
|
wifi24 = {
|
||||||
ssid = 'bremen.freifunk.net',
|
|
||||||
channel = 6,
|
channel = 6,
|
||||||
htmode = 'HT20',
|
htmode = 'HT20',
|
||||||
mesh_ssid = 'mesh.ffhb.de',
|
ap = {
|
||||||
mesh_bssid = '32:06:1C:1F:B9:E8',
|
ssid = 'bremen.freifunk.net',
|
||||||
mesh_mcast_rate = 6000,
|
},
|
||||||
|
ibss = {
|
||||||
|
ssid = 'mesh.ffhb.de',
|
||||||
|
bssid = '32:06:1C:1F:B9:E8',
|
||||||
|
mcast_rate = 6000,
|
||||||
|
},
|
||||||
|
--mesh = {
|
||||||
|
-- id = 'mesh.ffhb.de',
|
||||||
|
-- mcast_rate = 6000,
|
||||||
|
--},
|
||||||
},
|
},
|
||||||
wifi5 = {
|
wifi5 = {
|
||||||
ssid = 'bremen.freifunk.net',
|
|
||||||
channel = 44,
|
channel = 44,
|
||||||
htmode = 'HT40+',
|
htmode = 'HT40+',
|
||||||
mesh_ssid = 'mesh.ffhb.de',
|
ap = {
|
||||||
mesh_bssid = '32:06:1C:1F:B9:E8',
|
ssid = 'bremen.freifunk.net',
|
||||||
mesh_mcast_rate = 6000,
|
},
|
||||||
|
ibss = {
|
||||||
|
ssid = 'mesh.ffhb.de',
|
||||||
|
bssid = '32:06:1C:1F:B9:E8',
|
||||||
|
mcast_rate = 6000,
|
||||||
|
},
|
||||||
|
--mesh = {
|
||||||
|
-- id = 'mesh.ffhb.de',
|
||||||
|
-- mcast_rate = 6000,
|
||||||
|
--},
|
||||||
},
|
},
|
||||||
|
|
||||||
next_node = {
|
next_node = {
|
||||||
|
|
3
site.mk
3
site.mk
|
@ -1,7 +1,7 @@
|
||||||
GLUON_SITE_PACKAGES := \
|
GLUON_SITE_PACKAGES := \
|
||||||
gluon-mesh-batman-adv-14 \
|
gluon-mesh-batman-adv-14 \
|
||||||
gluon-alfred \
|
gluon-alfred \
|
||||||
gluon-announced \
|
gluon-respondd \
|
||||||
gluon-autoupdater \
|
gluon-autoupdater \
|
||||||
gluon-config-mode-core \
|
gluon-config-mode-core \
|
||||||
gluon-config-mode-hostname \
|
gluon-config-mode-hostname \
|
||||||
|
@ -24,7 +24,6 @@ GLUON_SITE_PACKAGES := \
|
||||||
iputils-ping6 \
|
iputils-ping6 \
|
||||||
iwinfo \
|
iwinfo \
|
||||||
iptables \
|
iptables \
|
||||||
kmod-ipt-nathelper \
|
|
||||||
firewall \
|
firewall \
|
||||||
haveged
|
haveged
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue