mirror of
https://github.com/ffrgb/site-ffrgb.git
synced 2024-12-27 19:31:51 +01:00
Update..
This commit is contained in:
parent
ee6ec34914
commit
0a8cb606ea
4
Makefile
4
Makefile
@ -1,6 +1,6 @@
|
||||
GLUON_BUILD_DIR := gluon-build
|
||||
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
|
||||
GLUON_GIT_REF := v2021.1.1
|
||||
GLUON_GIT_REF := e60b3eb386e1df3d48ee0f0bf8fe4cccbfe2397a
|
||||
|
||||
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
|
||||
|
||||
@ -40,7 +40,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
|
||||
|
||||
#JOBS = 1
|
||||
|
||||
GLUON_MAKE := ${MAKE} V=s BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
|
||||
GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
|
||||
GLUON_RELEASE=${GLUON_RELEASE} \
|
||||
GLUON_BRANCH=${GLUON_BRANCH} \
|
||||
|
||||
|
2
modules
2
modules
@ -4,4 +4,4 @@ PACKAGES_FFRGB_BRANCH=master
|
||||
PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72
|
||||
PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git
|
||||
PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan
|
||||
PACKAGES_COMMUNITY_COMMIT=43289c587312cb896a71a327b6a0972498dc76aa
|
||||
PACKAGES_COMMUNITY_COMMIT=86f28f9ebce00871bef9940a09d6865ffdf669b2
|
||||
|
29
site.conf
29
site.conf
@ -11,8 +11,6 @@
|
||||
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
|
||||
ntp_servers = {'ntp.ffrgb.net'},
|
||||
|
||||
mesh_on_wan = false,
|
||||
|
||||
regdom = 'DE',
|
||||
|
||||
mesh_vpn = {
|
||||
@ -52,5 +50,32 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
config_mode = {
|
||||
geo_location = {
|
||||
osm = {
|
||||
center = {
|
||||
lat = 49.01384173771134,
|
||||
lon = 12.096109539536478,
|
||||
},
|
||||
zoom = 12,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
interfaces = {
|
||||
lan = {
|
||||
default_roles = { 'client', 'mesh' },
|
||||
},
|
||||
wan = {
|
||||
default_roles = { 'uplink', 'mesh' },
|
||||
},
|
||||
single = {
|
||||
default_roles = { 'uplink', 'mesh' },
|
||||
},
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
|
||||
-- vim: set ft=lua:ts=2:sw=2:et
|
||||
|
41
site.mk
41
site.mk
@ -1,34 +1,27 @@
|
||||
GLUON_FEATURES := \
|
||||
autoupdater \
|
||||
config-mode-domain-select \
|
||||
config-mode-geo-location-osm \
|
||||
config-mode-mesh-vpn \
|
||||
ebtables-filter-multicast \
|
||||
ebtables-filter-ra-dhcp \
|
||||
ebtables-source-filter \
|
||||
mesh-batman-adv-15 \
|
||||
respondd \
|
||||
status-page \
|
||||
web-advanced \
|
||||
web-private-wifi \
|
||||
web-wizard
|
||||
|
||||
|
||||
GLUON_SITE_PACKAGES := \
|
||||
gluon-mesh-batman-adv-15 \
|
||||
gluon-respondd \
|
||||
gluon-autoupdater \
|
||||
gluon-config-mode-core \
|
||||
gluon-config-mode-autoupdater \
|
||||
gluon-config-mode-hostname \
|
||||
gluon-config-mode-domain-select \
|
||||
gluon-config-mode-geo-location \
|
||||
gluon-config-mode-contact-info \
|
||||
gluon-config-mode-mesh-vpn \
|
||||
gluon-ebtables-filter-multicast \
|
||||
gluon-ebtables-filter-ra-dhcp \
|
||||
gluon-ebtables-source-filter \
|
||||
gluon-web-admin \
|
||||
gluon-web-autoupdater \
|
||||
gluon-web-network \
|
||||
gluon-web-wifi-config \
|
||||
gluon-web-private-wifi \
|
||||
gluon-radvd \
|
||||
gluon-setup-mode \
|
||||
gluon-status-page \
|
||||
gluon-segment-mover \
|
||||
iwinfo \
|
||||
iptables \
|
||||
gluon-ssid-changer \
|
||||
respondd-module-airtime \
|
||||
gluon-mesh-vpn-wireguard-vxlan \
|
||||
ffrgb-banner #\
|
||||
#ffho-site-generate \
|
||||
#ffho-config-mode-site-select \
|
||||
ffrgb-banner
|
||||
|
||||
|
||||
# basic support for USB stack
|
||||
|
Loading…
Reference in New Issue
Block a user