Selaa lähdekoodia

Update Site-Repo for Testing-Release

Karsten Böddeker 8 vuotta sitten
vanhempi
commit
e7370f3d02
3 muutettua tiedostoa jossa 38 lisäystä ja 13 poistoa
  1. 36 11
      extra/sites.conf
  2. 1 1
      modules
  3. 1 1
      site.conf

+ 36 - 11
extra/sites.conf

@@ -33,7 +33,7 @@
 	ffho_bev = {
 		site_name = 'Freifunk Hochstift - Beverungen',
 		site_code = 'ffho_bev',
-		ssid = 'hochstift.freifunk.net/bev',
+		ssid = 'hochstift.freifunk.net/beverungn',
 	},
 	ffho_rhc = {
 		site_name = 'Freifunk Hochstift - Borchen',
@@ -41,9 +41,9 @@
 		ssid = 'hochstift.freifunk.net/borchen',
 	},
 	ffho_bxg = {
-		site_name = 'Freifunk Hochstift - Borgendreich',
+		site_name = 'Freifunk Hochstift - Borgentreich',
 		site_code = 'ffho_bxg',
-		ssid = 'hochstift.freifunk.net/borgendr',
+		ssid = 'hochstift.freifunk.net/borgentr',
 	},
 	ffho_bkk = {
 		site_name = 'Freifunk Hochstift - Brakel',
@@ -60,6 +60,16 @@
 		site_code = 'ffho_dek',
 		ssid = 'hochstift.freifunk.net/delbrueck',
 	},
+	ffho_gee = {
+		site_name = 'Freifunk Hochstift - Geseke',
+		site_code = 'ffho_gee',
+		ssid = 'hochstift.freifunk.net/geseke',
+	},
+	ffho_zwg = {
+		site_name = 'Freifunk Hochstift - Horn-Bad Meinberg',
+		site_code = 'ffho_zwg',
+		ssid = 'hochstift.freifunk.net/horn',
+	},
 	ffho_hvf = {
 		site_name = 'Freifunk Hochstift - Hövelhof',
 		site_code = 'ffho_hvf',
@@ -75,30 +85,45 @@
 		site_code = 'ffho_lit',
 		ssid = 'hochstift.freifunk.net/lichtenau',
 	},
+	ffho_lip = {
+		site_name = 'Freifunk Hochstift - Lippstadt',
+		site_code = 'ffho_lip',
+		ssid = 'hochstift.freifunk.net/lippstadt',
+	},
 	ffho_mms = {
 		site_name = 'Freifunk Hochstift - Marienmünster',
 		site_code = 'ffho_mms',
 		ssid = 'hochstift.freifunk.net/mms',
 	},
+	ffho_msg = {
+		site_name = 'Freifunk Hochstift - Marsberg',
+		site_code = 'ffho_msg',
+		ssid = 'hochstift.freifunk.net/marsberg',
+	},
 	ffho_yni = {
 		site_name = 'Freifunk Hochstift - Nieheim',
 		site_code = 'ffho_yni',
 		ssid = 'hochstift.freifunk.net/nieheim',
 	},
-	ffho_pad1 = {
-		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
-		site_code = 'ffho_pad1',
-		ssid = 'hochstift.freifunk.net/pad-umlnd',
-	},
-	ffho_pad2 = {
+	ffho_pad_cty = {
 		site_name = 'Freifunk Hochstift - Paderborn (Kernstadt)',
-		site_code = 'ffho_pad2',
+		site_code = 'ffho_pad_cty',
 		ssid = 'hochstift.freifunk.net/pad-city',
 	},
+	ffho_pad_uml = {
+		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+		site_code = 'ffho_pad_uml',
+		ssid = 'hochstift.freifunk.net/pad-umlnd',
+	},
 	ffho_szn = {
 		site_name = 'Freifunk Hochstift - Salzkotten',
 		site_code = 'ffho_szn',
-		ssid = 'hochstift.freifunk.net/salzk',
+		ssid = 'hochstift.freifunk.net/salzkottn',
+	},
+	ffho_yss = {
+		site_name = 'Freifunk Hochstift - Schieder-Schwalenberg',
+		site_code = 'ffho_yss',
+		ssid = 'hochstift.freifunk.net/schieder',
 	},
 	ffho_stm = {
 		site_name = 'Freifunk Hochstift - Steinheim',

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2015.1.x
-PACKAGES_FFHO_COMMIT=50de06d4e36bf895f7a2d888455982d5c88bc681
+PACKAGES_FFHO_COMMIT=a67a511abacb5e2c30fafd6c26c415626a157a03

+ 1 - 1
site.conf

@@ -10,7 +10,7 @@
 	
 	-- short name of this site
 	-- site_code = 'ffho_${un-code}'
-	site_code = 'default',
+	site_code = 'ffho',
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '10.132.0.0/18',