Change ffwp default domain name, urls and loc

domains/default.conf → domains/ffwp_default.conf

 {
-	domain_names = { default = 'Default' },
+	domain_names = { ffwp_default = 'FFWP Default' },
 	domain_seed = '9c97435bfe788f4c927d8ec8a3e58182d1eb344c1903be2e1f4dd39885dcc7b6',
 
 	prefix4 = '10.198.0.0/20',
@@ -42,7 +42,7 @@
             gw01 = {
               key = '2e27c65ec462cdb8dc8eefba4527701b1141489da985363a50555b5cfd15d952',
               remotes = {
-                  '"gw01.ffwp.frickelfunk.net" port 11000',
+                  '"gw01.ffwp.freifunk-kaiserslautern.de" port 11000',
                   '"gw01.premium.freifunk-westpfalz.de" port 11000',
                   '"gw01.ffwp.ffka.tech" port 11000',
               },
@@ -50,7 +50,7 @@
             gw02 = {
               key = '8969611a22cc5a3ae689fb7896af0fed1d27f47247be13f20a99cdbdbd4439a1',
               remotes = {
-                  '"gw02.ffwp.frickelfunk.net" port 11000',
+                  '"gw02.ffwp.freifunk-kaiserslautern.de" port 11000',
                   '"gw02.premium.freifunk-westpfalz.de" port 11000',
                   '"gw02.ffwp.ffka.tech" port 11000',
               },
@@ -58,7 +58,7 @@
             gw03 = {
               key = 'ef5229c92b3865205a5b092c115673430ee9d6cf2de36bf36a31c5e50f09db5e',
               remotes = {
-                  '"gw03.ffwp.frickelfunk.net" port 11000',
+                  '"gw03.ffwp.freifunk-kaiserslautern.de" port 11000',
                   '"gw03.premium.freifunk-westpfalz.de" port 11000',
                   '"gw03.ffwp.ffka.tech" port 11000',
               },
@@ -66,7 +66,7 @@
             gw04 = {
               key = 'f9870d512325f6a0f540d99805646279c62cd894abb4f37b9cece89d55898f4a',
               remotes = {
-                  '"gw04.ffwp.frickelfunk.net" port 11000',
+                  '"gw04.ffwp.freifunk-kaiserslautern.de" port 11000',
                   '"gw04.premium.freifunk-westpfalz.de" port 11000',
                   '"gw04.ffwp.ffka.tech" port 11000',
               },

i18n/de.po

@@ -96,6 +96,9 @@ msgstr ""
 "<p>Bitte halte Dich daran, sonst kann ein soziales Projekt wie dieses nicht funktionieren. "
 "</p> "
 
+msgid "gluon-config-mode:geo-location-help"
+msgstr ""
+
 msgid "gluon-config-mode:altitude-label"
 msgstr "Höhe"
 

i18n/gluon-site.pot

 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
+msgid "gluon-config-mode:welcome"
+msgstr ""
+
 msgid "gluon-config-mode:domain"
 msgstr ""
 
 msgid "gluon-config-mode:domain-select"
 msgstr ""
 
-msgid "gluon-config-mode:welcome"
+msgid "gluon-config-mode:pubkey"
 msgstr ""
 
-msgid "gluon-config-mode:pubkey"
+msgid "gluon-config-mode:novpn"
 msgstr ""
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
+
+msgid "gluon-config-mode:hostname-help"
+msgstr ""
+
+msgid "gluon-config-mode:geo-location-help"
+msgstr ""
+
+msgid "gluon-config-mode:altitude-label"
+msgstr ""
+
+msgid "gluon-config-mode:contact-help"
+msgstr ""
+
+msgid "gluon-config-mode:contact-note"
+msgstr ""
+
+msgid "gluon-web-node-role:role:backbone"
+msgstr ""
+
+msgid "gluon-web-node-role:role:node"
+msgstr ""
+
+msgid "gluon-web-node-role:role:offloader"
+msgstr ""
+
+msgid "gluon-web-node-role:role:test"
+msgstr ""
\ No newline at end of file

site.conf

@@ -2,7 +2,7 @@
   hostname_prefix = 'wp-',
   site_name = 'Freifunk Westpfalz',
   site_code = 'ffwp',
-  default_domain = 'default',
+  default_domain = 'ffwp_default',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
   ntp_servers = {'0.ntp.services.karlsruhe.freifunk.net','1.ntp.services.karlsruhe.freifunk.net','2.ntp.services.karlsruhe.freifunk.net','3.ntp.services.karlsruhe.freifunk.net'},
@@ -49,7 +49,7 @@
       pubkey_privacy = true,
 
       fastd= {
-        methods = {'null', 'salsa2012+umac'},
+        methods = {'salsa2012+umac'},
         configurable = false,
         groups = {
           backbone = {
@@ -71,8 +71,8 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://0.updates.services.ffwp.frickelfunk.net/images/stable/sysupgrade',
-          'http://1.updates.services.ffwp.frickelfunk.net/images/stable/sysupgrade',
+          'http://0.updates.services.ffwp.freifunk-kaiserslautern.de/images/stable/sysupgrade',
+          'http://1.updates.services.ffwp.freifunk-kaiserslautern.de/images/stable/sysupgrade',
           'http://download.premium.freifunk-westpfalz.de/stable/sysupgrade',
         },
         good_signatures = 3,
@@ -89,8 +89,8 @@
       beta = {
         name = 'beta',
         mirrors = {
-          'http://0.updates.services.ffwp.frickelfunk.net/images/beta/sysupgrade',
-          'http://1.updates.services.ffwp.frickelfunk.net/images/beta/sysupgrade',
+          'http://0.updates.services.ffwp.freifunk-kaiserslautern.de/images/beta/sysupgrade',
+          'http://1.updates.services.ffwp.freifunk-kaiserslautern.de/images/beta/sysupgrade',
           'http://download.premium.freifunk-westpfalz.de/beta/sysupgrade',
         },
         good_signatures = 1,
@@ -107,8 +107,8 @@
       nightly = {
         name = 'nightly',
         mirrors = {
-          'http://0.updates.services.ffwp.frickelfunk.net/images/nightly/sysupgrade',
-          'http://1.updates.services.ffwp.frickelfunk.net/images/nightly/sysupgrade',
+          'http://0.updates.services.ffwp.freifunk-kaiserslautern.de/images/nightly/sysupgrade',
+          'http://1.updates.services.ffwp.freifunk-kaiserslautern.de/images/nightly/sysupgrade',
           'http://download.premium.freifunk-westpfalz.de/nightly/sysupgrade',
         },
         good_signatures = 1,