From e9234098b19d05fd0a10b4d3dc79055edb390bd5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 25 Jan 2019 21:35:13 +0100
Subject: [PATCH] Preparations for multidomain migration

---
 config/defaults.erb    | 1 +
 template/site.conf.erb | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index 17a8eb6..96052cc 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -58,6 +58,7 @@ gluon_site_packages = %w(
 	haveged
 	iptables
 	iwinfo
+	site2domain
 )
 
 signing_keys = [
diff --git a/template/site.conf.erb b/template/site.conf.erb
index a2a83f6..c83bf2e 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -7,7 +7,7 @@
 	opkg = {
 		lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
 		extra = {
-			modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.hamburg.freifunk.net/multi/stable/archive/modules/gluon-ffhh-%GR/%S',
 		},
 	},
 
@@ -87,7 +87,7 @@
 		branches = {
 			stable = {
 				name = 'stable',
-				mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/stable/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/stable/sysupgrade'},
+				mirrors = {'http://1.updates.services.ffhh/multi/stable/sysupgrade','http://2.updates.services.ffhh/multi/stable/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 <% signing_keys.each do | key | -%>
@@ -97,7 +97,7 @@
 			},
 			beta = {
 				name = 'beta',
-				mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/beta/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/beta/sysupgrade'},
+				mirrors = {'http://1.updates.services.ffhh/multi/beta/sysupgrade','http://2.updates.services.ffhh/multi/beta/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 <% signing_keys.each do | key | -%>
@@ -107,7 +107,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade'},
+				mirrors = {'http://1.updates.services.ffhh/multi/experimental/sysupgrade','http://2.updates.services.ffhh/multi/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 <% signing_keys_experimental.each do | key | -%>