From b571da8672dc2d0143f16ca61b91b62a2f93d9f5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 19 Dec 2015 22:42:56 +0000 Subject: [PATCH] Guidance about which domains require letsencrypt --- locale/de/freedombone-config.json | 5 +++-- locale/de/freedombone-controlpanel.json | 1 + locale/es/freedombone-config.json | 5 +++-- locale/es/freedombone-controlpanel.json | 1 + locale/fr/freedombone-config.json | 5 +++-- locale/fr/freedombone-controlpanel.json | 1 + src/freedombone-config | 8 ++++---- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/locale/de/freedombone-config.json b/locale/de/freedombone-config.json index 3fe20a15..3437f8d3 100644 --- a/locale/de/freedombone-config.json +++ b/locale/de/freedombone-config.json @@ -137,9 +137,10 @@ "Owncloud Configuration": "", "\\nPlease enter your Owncloud details:": "", "Hubzilla Configuration": "", - "\\nPlease enter your Hubzilla details:": "", + "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", + "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", "Microblog Configuration": "", - "\\nPlease enter your Microblog details:": "", + "\\nPlease enter your Microblog details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", "Developer Configuration": "", "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "", "Your main domain name": "", diff --git a/locale/de/freedombone-controlpanel.json b/locale/de/freedombone-controlpanel.json index 6bbadf13..7f6f681c 100644 --- a/locale/de/freedombone-controlpanel.json +++ b/locale/de/freedombone-controlpanel.json @@ -87,6 +87,7 @@ "DLNA": "", "VoIP": "", "Tox": "", + "Restore from ${remote_domain_name}": "", "Restore data from USB": "", "Plug in your backup USB drive": "", "Restore data from remote server": "", diff --git a/locale/es/freedombone-config.json b/locale/es/freedombone-config.json index 3fe20a15..3437f8d3 100644 --- a/locale/es/freedombone-config.json +++ b/locale/es/freedombone-config.json @@ -137,9 +137,10 @@ "Owncloud Configuration": "", "\\nPlease enter your Owncloud details:": "", "Hubzilla Configuration": "", - "\\nPlease enter your Hubzilla details:": "", + "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", + "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", "Microblog Configuration": "", - "\\nPlease enter your Microblog details:": "", + "\\nPlease enter your Microblog details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", "Developer Configuration": "", "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "", "Your main domain name": "", diff --git a/locale/es/freedombone-controlpanel.json b/locale/es/freedombone-controlpanel.json index 6bbadf13..7f6f681c 100644 --- a/locale/es/freedombone-controlpanel.json +++ b/locale/es/freedombone-controlpanel.json @@ -87,6 +87,7 @@ "DLNA": "", "VoIP": "", "Tox": "", + "Restore from ${remote_domain_name}": "", "Restore data from USB": "", "Plug in your backup USB drive": "", "Restore data from remote server": "", diff --git a/locale/fr/freedombone-config.json b/locale/fr/freedombone-config.json index 3fe20a15..3437f8d3 100644 --- a/locale/fr/freedombone-config.json +++ b/locale/fr/freedombone-config.json @@ -137,9 +137,10 @@ "Owncloud Configuration": "", "\\nPlease enter your Owncloud details:": "", "Hubzilla Configuration": "", - "\\nPlease enter your Hubzilla details:": "", + "\\nPlease enter your Hubzilla details.\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", + "\\nPlease enter your Hubzilla details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", "Microblog Configuration": "", - "\\nPlease enter your Microblog details:": "", + "\\nPlease enter your Microblog details\\n\\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:": "", "Developer Configuration": "", "\\nPlease enter your Git hosting site details.\\nIf You don't need developer tools then just select Ok": "", "Your main domain name": "", diff --git a/locale/fr/freedombone-controlpanel.json b/locale/fr/freedombone-controlpanel.json index 6bbadf13..7f6f681c 100644 --- a/locale/fr/freedombone-controlpanel.json +++ b/locale/fr/freedombone-controlpanel.json @@ -87,6 +87,7 @@ "DLNA": "", "VoIP": "", "Tox": "", + "Restore from ${remote_domain_name}": "", "Restore data from USB": "", "Plug in your backup USB drive": "", "Restore data from remote server": "", diff --git a/src/freedombone-config b/src/freedombone-config index aa971b81..8ee16dce 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -1399,14 +1399,14 @@ function interactive_configuration { if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then dialog --backtitle $"Freedombone Configuration" \ --title $"Hubzilla Configuration" \ - --form $"\nPlease enter your Hubzilla details:" 11 55 3 \ + --form $"\nPlease enter your Hubzilla details.\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 14 55 3 \ $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \ $"Code:" 2 1 "$(grep 'HUBZILLA_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \ 2> $data else dialog --backtitle $"Freedombone Configuration" \ --title $"Hubzilla Configuration" \ - --form $"\nPlease enter your Hubzilla details:" 11 55 3 \ + --form $"\nPlease enter your Hubzilla details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \ $"Domain:" 1 1 "$(grep 'HUBZILLA_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \ 2> $data fi @@ -1448,14 +1448,14 @@ function interactive_configuration { if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then dialog --backtitle $"Freedombone Configuration" \ --title $"Microblog Configuration" \ - --form $"\nPlease enter your Microblog details:" 11 55 3 \ + --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \ $"Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \ 2> $data else dialog --backtitle $"Freedombone Configuration" \ --title $"Microblog Configuration" \ - --form $"\nPlease enter your Microblog details:" 11 55 3 \ + --form $"\nPlease enter your Microblog details\n\nIMPORTANT: This should be a domain name which is supported by Let's Encrypt:" 11 55 3 \ $"Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \ 2> $data fi