From db19a8a4439f557166fa526a034c227d5d35a856 Mon Sep 17 00:00:00 2001
From: alex <alex@noreply.git.dezentrale.cloud>
Date: Thu, 22 Jul 2021 21:53:18 +0200
Subject: [PATCH] Our new site config

TODO: change signing keys for autoupdate
---
 site.conf | 64 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/site.conf b/site.conf
index c2bb684..53efc1b 100644
--- a/site.conf
+++ b/site.conf
@@ -1,48 +1,48 @@
 {
-	hostname_prefix = 'gluon-l',
-	site_name = 'Freifunk Leipzig',
-	site_code = 'l',
+	hostname_prefix = 'node-',
+	site_name = 'freifunk-leipzig.de',
+	site_code = 'gluon.freifunk-leipzig.de',
 	domain_seed = '9cac58cc344d652b8b4d5d4e68dfa74d43d114a0e88041d6afe439b8caee54d5',
 
-	prefix4 = '10.61.3.0/24',
-	prefix6 = 'fdef:ffc0:7030::/64',
+	prefix4 = '10.13.12.0/24',
+	prefix6 = 'fdd3:2e74:041e::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'gluon-ntp.leipzig.freifunk.net'},
+	ntp_servers = {'ntp.freifunk-leipzig.de'},
 	regdom = 'DE',
 
 	wifi24 = {
 		ap = {
-		    ssid = '061-FREIFUNK-',
+		    ssid = 'freifunk-leipzig.de',
 		},
 		channel = 1,
 		mesh = {
-		     id = 'LiMe',
+		     id = 'de:ze:nt:ra:le.space',
 		     mcast_rate = 12000,
 		},
 	},
 	wifi5 = {
 		ap = {
-		    ssid = '061-FREIFUNK-',
+		    ssid = 'freifunk-leipzig.de',
 		},
 		channel = 44,
 		mesh = {
-		     id = 'LiMe',
+		     id = 'de:ze:nt:ra:le.space',
 		     mcast_rate = 12000,
 		},
 	},
 	
-        mesh = {
-                vxlan = false,
+	mesh = {
+			vxlan = false,
 		batman_adv = {
-    		  routing_algo = 'BATMAN_IV',
-  		},
-        },
+			routing_algo = 'BATMAN_IV',
+		},
+	},
 
 	next_node = {
-		ip4 = '10.61.3.3',
-		ip6 = 'fdef:ffc0:3dd7::1',
-		mac = '16:41:95:40:f7:dc',
+		ip4 = '10.13.12.3',
+		ip6 = 'fdd3:2e74:041e::1',
+		mac = '77:82:71:33:54:2c',
 	},
 
 	mesh_vpn = {
@@ -55,17 +55,13 @@
 			backbone = {
 				limit = 2,
 				peers = {
-					vpngluon1 = {
-						key = '7e383ce9ba4fea8a82c1860864c2f940ef9f8a92b04f62fb7ac5f57442872f0e',
-						remotes = {'ipv4 "gluon20171a61.leipzig.freifunk.net" port 10061'},
+					vpn_ip4 = {
+						key = 'fcdccf8beee4c2dc3064f13d44339173ca23f94ef081c7d43be5ca0a2e89e93d',
+						remotes = {'ipv4 "gluon-vpn.freifunk-leipzig.de" port 2342'},
 					},
-					vpngluon2 = {
-						key = '6a5e3d0d88feb0350078b5ce7c7a15baf918e0c2455d6854ec933c96c7a01a43',
-						remotes = {'ipv4 "gluon20171b61.leipzig.freifunk.net" port 10061'},
-					},
-					vpngluon3 = {
-						key = '4414df684d9d6e28f845753e4c9c1ebe2cc041f567ca3f09cafb51b73d19ea6b',
-						remotes = {'ipv4 "gluon20171c61.leipzig.freifunk.net" port 10061'},
+					vpn_ip6 = {
+						key = 'fcdccf8beee4c2dc3064f13d44339173ca23f94ef081c7d43be5ca0a2e89e93d',
+						remotes = {'ipv6 "gluon-vpn.freifunk-leipzig.de" port 2342'},
 					},
 				},
 			},
@@ -78,30 +74,30 @@
 		branches = {
 			stable = {
 				name = 'stable',
-				mirrors = {'http://gluon-updates-20161a.leipzig.freifunk.net/stable/sysupgrade'},
+				mirrors = {'http://update.freifunk-leipzig.de/stable/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
 					'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
-					},
+				},
 			},
 			beta = {
 				name = 'beta',
-				mirrors = {'http://gluon-updates20161a.leipzig.freifunk.net/beta/sysupgrade'},
+				mirrors = {'http://update.leipzig.freifunk.net/beta/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
 					'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
-					},
+				},
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://gluon-updates20161a.leipzig.freifunk.net/experimental/sysupgrade'},
+				mirrors = {'http://update.leipzig.freifunk.net/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
 					'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
-					},
+				},
 			},
 		},
 	},