Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gluon-site
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Freifunk Saar
gluon-site
Commits
3060f638
Commit
3060f638
authored
Dec 29, 2019
by
Ralf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
preliminary multi-domain support
parent
36694315
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
117 additions
and
91 deletions
+117
-91
domains/saar.conf
domains/saar.conf
+92
-0
site.conf
site.conf
+21
-84
site.mk
site.mk
+4
-7
No files found.
domains/saar.conf
0 → 100644
View file @
3060f638
{
domain_names
= {
--
User
-
visible
domain
name
(
s
).
saar
=
'Saarbrücken + Legacy'
},
--
Our
random
seed
.
domain_seed
=
'd37078260d18043235dc61425012ada48297324fd754f3c40eab1d44910957a8'
,
--
VPN
entry
points
.
mesh_vpn
= {
tunneldigger
= {
brokers
= {
'gw1.saar.freifunk.net:10000'
,
'gw2.saar.freifunk.net:10000'
,
'gw3.saar.freifunk.net:10000'
,
'gw4.saar.freifunk.net:10000'
,
},
},
},
--
Prefixes
used
within
the
mesh
.
prefix4
=
'10.24.192.0/19'
,
prefix6
=
'fd4e:f2d7:88d2:ffff::/64'
,
extra_prefixes6
= {
'2a03:2260:3009::/52'
},
--
Network
services
.
dns
= {
servers
= {
'fd4e:f2d7:88d2:ffff::101'
,
'fd4e:f2d7:88d2:ffff::102'
,
'fd4e:f2d7:88d2:ffff::103'
,
'fd4e:f2d7:88d2:ffff::104'
,
},
},
ntp_servers
= {
'gw1.ffsaar'
,
'gw2.ffsaar'
,
'gw3.ffsaar'
,
'gw4.ffsaar'
,
},
--
The
next
node
feature
allows
clients
to
always
reach
the
node
it
is
--
connected
to
using
a
known
IP
address
.
next_node
= {
name
= {
'router.ffsaar'
,
'node.ffsaar'
,
'local.ffsaar'
,
'knoten.ffsaar'
,
'my.ffsaar'
},
--
anycast
IPs
of
all
nodes
ip4
=
'10.24.192.1'
,
ip6
=
'fd4e:f2d7:88d2:ffff::1'
,
--
anycast
MAC
of
all
nodes
(
only
exists
for
backwards
compatibility
)
mac
=
'32:3d:f9:8f:01:52'
,
},
mesh
= {
--
This
is
the
legacy
domain
,
and
thus
does
not
use
vxlan
.
vxlan
=
false
,
},
--
Wireless
configuration
for
2
.
4
GHz
interfaces
.
wifi24
= {
--
Wireless
channel
.
channel
=
1
,
ap
= {
--
ESSID
used
for
client
network
.
ssid
=
'saar.freifunk.net'
,
},
mesh
= {
--
ESSID
used
for
mesh
network
.
id
=
'24.6d:65:73:68.66:66:73:61:61:72'
,
},
},
--
Wireless
configuration
for
5
GHz
interfaces
.
--
This
should
be
equal
to
the
2
.
4
GHz
variant
,
except
--
for
channel
and
htmode
.
wifi5
= {
--
Wireless
channel
.
channel
=
36
,
ap
= {
--
ESSID
used
for
client
network
.
ssid
=
'saar.freifunk.net'
,
},
mesh
= {
--
ESSID
used
for
mesh
network
.
id
=
'50.6d:65:73:68.66:66:73:61:61:72'
,
},
},
}
site.conf
View file @
3060f638
...
...
@@ -12,73 +12,48 @@
--
Shorthand
of
the
community
.
site_code
=
'ffsaar'
,
--
Our
random
seed
.
domain_seed
=
'd37078260d18043235dc61425012ada48297324fd754f3c40eab1d44910957a8'
,
--
Prefixes
used
within
the
mesh
.
Both
are
required
.
prefix4
=
'10.24.192.0/19'
,
prefix6
=
'fd4e:f2d7:88d2:ffff::/64'
,
extra_prefixes6
= {
'2a03:2260:3009::/52'
},
--
Default
domain
.
default_domain
=
'saar'
,
--
Timezone
of
your
community
.
--
See
http
://
wiki
.
openwrt
.
org
/
doc
/
uci
/
system
#time.zones
timezone
=
'CET-1CEST,M3.5.0,M10.5.0/3'
,
--
List
of
NTP
servers
in
your
community
.
--
Must
be
reachable
using
IPv6
!
ntp_servers
= {
'gw1.ffsaar'
,
'gw2.ffsaar'
,
'gw3.ffsaar'
,
'gw4.ffsaar'
,
},
--
Wireless
regulatory
domain
of
your
community
.
regdom
=
'DE'
,
--
Wireless
configuratoin
for
2
.
4
GHz
interfaces
.
wifi24
= {
--
Wireless
channel
.
channel
=
1
,
--
Mesh
settings
.
mesh
= {
batman_adv
= {
routing_algo
=
'BATMAN_IV'
,
},
},
ap
= {
--
ESSID
used
for
client
network
.
ssid
=
'saar.freifunk.net'
,
--
VPN
settings
.
mesh_vpn
= {
enabled
=
true
,
mtu
=
1406
,
bandwidth_limit
= {
enabled
=
false
,
ingress
=
8000
,
egress
=
2000
,
},
},
--
Wireless
configuration
for
2
.
4
GHz
interfaces
.
wifi24
= {
mesh
= {
id
=
'24.6d:65:73:68.66:66:73:61:61:72'
,
mcast_rate
=
12000
,
},
},
--
Wireless
configuration
for
5
GHz
interfaces
.
--
This
should
be
equal
to
the
2
.
4
GHz
variant
,
except
--
for
channel
and
htmode
.
wifi5
= {
--
Wireless
channel
.
channel
=
36
,
ap
= {
--
ESSID
used
for
client
network
.
ssid
=
'saar.freifunk.net'
,
},
mesh
= {
id
=
'50.6d:65:73:68.66:66:73:61:61:72'
,
mcast_rate
=
12000
,
},
},
dns
= {
servers
= {
'fd4e:f2d7:88d2:ffff::101'
,
'fd4e:f2d7:88d2:ffff::102'
,
'fd4e:f2d7:88d2:ffff::103'
,
'fd4e:f2d7:88d2:ffff::104'
,
},
},
--
Config
mode
settings
.
config_mode
= {
geo_location
= {
osm
= {
...
...
@@ -91,45 +66,7 @@
},
},
--
The
next
node
feature
allows
clients
to
always
reach
the
node
it
is
--
connected
to
using
a
known
IP
address
.
next_node
= {
name
= {
'router.ffsaar'
,
'node.ffsaar'
,
'local.ffsaar'
,
'knoten.ffsaar'
,
'my.ffsaar'
},
--
anycast
IPs
of
all
nodes
ip4
=
'10.24.192.1'
,
ip6
=
'fd4e:f2d7:88d2:ffff::1'
,
--
anycast
MAC
of
all
nodes
mac
=
'32:3d:f9:8f:01:52'
,
},
mesh
= {
--
for
compat
with
older
nodes
,
leave
this
at
false
for
now
vxlan
=
false
,
batman_adv
= {
routing_algo
=
'BATMAN_IV'
,
},
},
mesh_vpn
= {
enabled
=
true
,
mtu
=
1406
,
tunneldigger
= {
brokers
= {
'gw1.saar.freifunk.net:10000'
,
'gw2.saar.freifunk.net:10000'
,
'gw3.saar.freifunk.net:10000'
,
'gw4.saar.freifunk.net:10000'
,
},
},
bandwidth_limit
= {
enabled
=
false
,
ingress
=
8000
,
egress
=
2000
,
},
},
--
Auto
-
updater
settings
.
autoupdater
= {
enabled
=
true
,
--
Default
branch
.
Don
'
t
forget
to
set
GLUON_BRANCH
when
building
!
...
...
site.mk
View file @
3060f638
...
...
@@ -39,14 +39,11 @@ GLUON_SITE_PACKAGES := \
DEFAULT_GLUON_RELEASE
:=
$(
shell
$(GLUON_SITEDIR)
/version.sh
)
## 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
# Enable multo-domain support.
GLUON_MULTIDOMAIN
:=
1
# Allow overriding the release number from the command line
# Set release number.
# Using `?=` to allow overriding the release number from the command line.
GLUON_RELEASE
?=
$(DEFAULT_GLUON_RELEASE)
# Default priority for updates.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment