Skip to content
This repository has been archived by the owner on Feb 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #6 from grische/feature/multidomain
Browse files Browse the repository at this point in the history 
Move domains to multidomain setup
  • Loading branch information
@grische
grische authored Jun 17, 2023
2 parents d295810 + f994958 commit dbcf6f4
Show file tree
Hide file tree
Showing 23 changed files with 745 additions and 657 deletions.
104 changes: 20 additions & 84 deletions domains/01/site.conf
View file
Original file line number Diff line number Diff line change
@@ -1,106 +1,44 @@
{
authorized_keys = { 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdm5b4sh3xIG43MFurqYT0hx89xITSRRyDE/WwPPcqDqjFpdb2hJOy6aHHPQ1W2OY12VSOqBuFLeqI6TKOVTCyd36GeaEzpoCrV0NDM5hFJEH/v7Q/cgP87lqqSfa5GEFJW1CKj02Ptf77JJSD8JOFjES0Ue+8qMyL0EQKSZ/sKvnGZKaQQNPTkTY/yP4T6jwBYqBMea7f7q19cYNcPyZR/50IZyHADXcTSfmvvMmjL34OPn/X84ZpfDtGtMwgWJi/BwSG6D2Z0XKNMwECxaNcGUvjdY8vyXR0EYlWF5NVw86h/ShF+AGN3Bd4TZLV79krUeJkK3e36u0v+JT5C+03 root@esprimp-v5535',
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4gKXfdlBiN8/HTjOr8E4Yt9sdVfpJ+5lDJeK/GAOM3JFDT7UTUiZd7p5RIa6V5RznYDIpQ6HO9AKeN29L1tqmjbg5qY9EAoeTD/kMBxAf1v71Dk4QS/NukEojiNl2ut7ACCOXVb9otbNpYGt55Saq67gkN12iS18Twdu+ejwEUxZH0YV2WtUZybgM6SMC203EdIyEAZ6fQoh9Kvv0YBdPR5+AQ4fZqO/enTk48f7hLza8wn6Zo9DD0GHasT2nLkmaSWef22HgIwUQXrKxkGDZPif9C6lIi35+ZE3O9M6njmLUGFHFH0+fvlygfO0SZPNYcXj8iMBXKymCdfSRW3BbEZX9ql6tk34SgNmu9fCGHnVr8fZUFfmh5NEwDL1IgdNB+894hGPGGMEO2B+OdxsWCmwCnGhHVHYsxzP3ybEgKBlnTbTDjJoeD5yL0ig799NmnaHO0t4G/YLoNyR3KH2sYwXeiKoJkWmYtp1WCZZjT+JnMrabdquBYI2axcRbtdeNNtUnjl608dMQb7AeIARqzyoIiVkaVDaGFii5c1V/ygD3ri1u6laTYVSLfrPVkYBJsJ+DuLSbj/tz/fwfTUOO1h60Mu6VFi0m4kBtgK2H7gCCnmhMke2xzzi9pPBDGxJ97HrrxqSD21kVk39ssKTwRqDaV7LVgHLAQcmRsZxfjw== martin@martin-ThinkPad-T450s' },

hostname_prefix = 'ffTST',
site_name = 'Freifunk DON Domäne 01 TEST',
site_code = 'ffdond01',
domain_seed = 'b9d58035a5a2256627a813ee9d10ebdbf53bbac562fddf240c28ed2becf4c0ec',
hostname_prefix = 'ffdon-',
site_name = 'Freifunk Donau-Ries',
site_code = 'ffdon',
default_domain = 'ffdon_test',

mesh_on_lan = true,

prefix4 = '10.86.8.0/22',
prefix6 = '2a03:2260:3005:100::/64',

-- timezone
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin

-- network ntp services
ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' },

-- regulatory domain of your wifi
regdom = 'DE',

-- config mode reglements
config_mode = {
hostname = {
optional = true,
},
geo_location = {
show_altitude = true,
},
remote_login = {
show_password_form = true,
min_password_length = 10,
},
},

wifi24 = {
channel = 1,
ap = {
ssid = 'TEST@Freifunk-Donau-Ries',
},
ibss = {
ssid = '02:00:0a:56:08:00',
bssid = '02:00:0a:56:08:00',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'TEST@Freifunk-Donau-Ries',
},
ibss = {
ssid = '02:00:0a:56:08:00',
bssid = '02:00:0a:56:08:00',
mcast_rate = 12000,
},
},

next_node = {
name = { 'knoten', },
ip4 = '10.86.8.1',
ip6 = '2a03:2260:3005:100::1',
mac = '02:00:0a:56:08:01',
},

dns = {
cacheentries = 20000,
servers = { '2a03:2260:3005:100::2', '2a03:2260:3005:100::5' },
},

mesh = {
vxlan = false,
},

mesh_vpn = {
mtu = 1364,
tunneldigger = {
brokers = {
'dom01snode01.ffdon.de:20001',
'dom01snode02.ffdon.de:20001',
},
},

bandwidth_limit = {
enabled = false,
ingress = 25000,
egress = 5000,
enabled = false,
ingress = 25000,
egress = 5000,
},
},

-- mesh on LAN config
mesh_on_lan = true,


-- autoupdater config
autoupdater = {
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://1.updates.services.ffdon/ffdonV2/Domaene-01/stable/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/Domaene-01/stable/sysupgrade',

'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade',
},
good_signatures = 3,
pubkeys = {
Expand All @@ -118,8 +56,8 @@
beta = {
name = 'beta',
mirrors = {
'http://1.updates.services.ffdon/ffdonV2/Domaene-01/beta/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/Domaene-01/beta/sysupgrade',
'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade',
},
good_signatures = 2,
pubkeys = {
Expand All @@ -132,13 +70,13 @@
'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath
'50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische
'24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk
'6c196570ee5f8f4a567d5e2ae9d37c07dc2e40ef737724ae55f424cd079bac07', -- FF-Buildservice
}, },
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://1.updates.services.ffdon/ffdonV2/Domaene-01/experimental/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/Domaene-01/experimental/sysupgrade',
'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade',
},
good_signatures = 1,
pubkeys = {
Expand All @@ -151,10 +89,8 @@
'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath
'50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische
'24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk
'6c196570ee5f8f4a567d5e2ae9d37c07dc2e40ef737724ae55f424cd079bac07', -- FF-Buildservice
},
},
},
},
mesh_on_lan = true,
}
80 changes: 19 additions & 61 deletions domains/03/site.conf
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,44 @@
{
hostname_prefix = 'ffDon',
site_name = 'Freifunk DON Domäne 03 Donauwoerth',
site_code = 'ffdond03',
domain_seed = '19628ca4709ecdf2fc2dadb9202a2a41b47b21dfc589d28b5a7e25a81e1e093d',

prefix4 = '10.86.16.0/22',
prefix6 = '2a03:2260:3005:300::/64',
hostname_prefix = 'ffdon-',
site_name = 'Freifunk Donau-Ries',
site_code = 'ffdon',
default_domain = 'ffdon_donauwoerth',

mesh_on_lan = true,

-- timezone
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin

-- network ntp services
ntp_servers = { '0.de.pool.ntp.org', '1.de.pool.ntp.org', '2.de.pool.ntp.org', '3.de.pool.ntp.org' },

-- regulatory domain of your wifi
regdom = 'DE',

wifi24 = {
channel = 1,
ap = {
ssid = 'Freifunk-Donau-Ries',
},
ibss = {
ssid = '02:00:0a:56:10:00',
bssid = '02:00:0a:56:10:00',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'Freifunk-Donau-Ries',
},
ibss = {
ssid = '02:00:0a:56:10:00',
bssid = '02:00:0a:56:10:00',
mcast_rate = 12000,
},
},

next_node = {
name = { 'knoten' },
ip4 = '10.86.16.1',
ip6 = '2a03:2260:3005:300::1',
mac = '02:00:0a:56:10:01',
},

dns = {
cacheentries = 20000,
servers = { '2a03:2260:3005:300::2', '2a03:2260:3005:300::5' },
},

mesh = {
vxlan = false,
},

mesh_vpn = {
mtu = 1364,
tunneldigger = {
brokers = {
'dom03snode01.ffdon.de:20003',
'dom03snode02.ffdon.de:20003',
},
},

bandwidth_limit = {
enabled = false,
ingress = 25000,
egress = 5000,
enabled = false,
ingress = 25000,
egress = 5000,
},
},

-- autoupdater config
autoupdater = {
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://1.updates.services.ffdon/ffdonV2/Domaene-03/stable/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/Domaene-03/stable/sysupgrade',
'http://1.updates.services.ffdon/ffdonV2/stable/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/stable/sysupgrade',
},
good_signatures = 3,
pubkeys = {
Expand All @@ -99,8 +56,8 @@
beta = {
name = 'beta',
mirrors = {
'http://1.updates.services.ffdon/ffdonV2/Domaene-03/beta/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/Domaene-03/beta/sysupgrade',
'http://1.updates.services.ffdon/ffdonV2/beta/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/beta/sysupgrade',
},
good_signatures = 2,
pubkeys = {
Expand All @@ -113,12 +70,13 @@
'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath
'50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische
'24b25027ebe9c76ece1db0e562755f852b35c92e5a68f63f831bb4e6ad7b4bef', -- FFDON-mgk
}, },
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://1.updates.services.ffdon/ffdonV2/Domaene-03/experimental/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/Domaene-03/experimental/sysupgrade',
'http://1.updates.services.ffdon/ffdonV2/experimental/sysupgrade',
'http://firmware2.ffdon.de/ffdonV2/experimental/sysupgrade',
},
good_signatures = 1,
pubkeys = {
Expand Down
Loading

0 comments on commit dbcf6f4

Please sign in to comment.