From 5dda2a5b6e588cb6fde0a1716764a0fbe71b8d06 Mon Sep 17 00:00:00 2001 From: "Manu.WTF" <43337106+Dark4MD@users.noreply.github.com> Date: Thu, 22 Jul 2021 23:20:41 +0200 Subject: [PATCH] Added unconfigured Domain and set to default (#61) --- domains/dom0.conf | 3 +-- domains/dom10.conf | 1 + domains/gen.py | 5 +++-- site.conf | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/domains/dom0.conf b/domains/dom0.conf index 72ba990..4bcf60e 100644 --- a/domains/dom0.conf +++ b/domains/dom0.conf @@ -94,7 +94,6 @@ }, } } } } }, - -- primary domain name "Domain 0" should be hidden in config mode - hide_domain = { 'dom0' }, + hide_domain = true, } \ No newline at end of file diff --git a/domains/dom10.conf b/domains/dom10.conf index 5596f8b..5449c2d 100644 --- a/domains/dom10.conf +++ b/domains/dom10.conf @@ -6,6 +6,7 @@ domain_names = { hameln = 'Hameln', alfeld = 'Alfeld', + unconfigured = 'Bitte auswählen', dom10 = 'Domain 10', }, diff --git a/domains/gen.py b/domains/gen.py index 60339f0..4838201 100755 --- a/domains/gen.py +++ b/domains/gen.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# coding: utf8 import argparse import os @@ -10,8 +11,8 @@ h = "Hannover: " domains = { - 0: { "names": { "legacy": "Legacy" } }, - 10: { "names": { "hameln": "Hameln", "alfeld": "Alfeld" }, }, + 0: { "names": { "legacy": "Legacy" }, "hide": True }, + 10: { "names": { "hameln": "Hameln", "alfeld": "Alfeld", "unconfigured": "Bitte auswählen" }, }, 11: { "names": { "lenthe": "Lenthe" } }, 12: { "names": { "steinhude": "Steinhude" } }, 13: { "names": { "springe": "Springe", "obernkirchen": "Obernkirchen" } }, diff --git a/site.conf b/site.conf index b2ea7d6..350b5f8 100644 --- a/site.conf +++ b/site.conf @@ -3,7 +3,7 @@ site_name = 'Freifunk Hannover', site_code = 'ffh', - default_domain = 'legacy', + default_domain = 'unconfigured', opkg = { openwrt = 'http://downloads.openwrt.org/releases/packages-%v/%A',