diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index d4dad7652..4a2a9e2e0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -828,6 +828,7 @@
'dns configuration' => 'DNS-Konfiguration',
'dns desc' => 'Wenn auf Schnittstelle red0 die IP-Adressinformationen über DHCP vom Provider kommen, werden automatisch die DNS-Server-Adressen des Providers gesetzt. Hier können Sie nun diese mit den eigenen DNS-Server-IP-Adressen überschreiben.',
'dns enable safe-search' => 'Safe Search via DNS aktivieren',
+'dns enable safe-search youtube' => 'YouTube in Safe Search einbeziehen',
'dns error 0' => 'Die IP Adresse vom primären DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!
Die eingegebene sekundären DNS Server Adresse ist jedoch gültig.
',
'dns error 01' => 'Die eingegebene IP Adresse des primären wie auch des sekundären DNS-Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!',
'dns error 1' => 'Die IP Adresse vom sekundären DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!
Die eingegebene primäre DNS Server Adresse ist jedoch gültig.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 19a5eb02f..1151da08d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -851,6 +851,7 @@
'dns could not add server' => 'Could not add server - Reason:',
'dns desc' => 'If the red0 interface gets the IP address information via DHCP from the provider, the DNS server addresses will be set automatically. Now here you are able to change these DNS server IP addresses with your own ones.',
'dns enable safe-search' => 'Enable Safe Search',
+'dns enable safe-search youtube' => 'Include YouTube in Safe Search',
'dns error 0' => 'The IP address of the primary DNS server is not valid, please check your entries!
The entered secondary DNS server address is valid.',
'dns error 01' => 'The entered IP address of the primary and secondary DNS server are not valid, please check your entries!',
'dns error 1' => 'The IP address of the secondary DNS server is not valid, please check your entries!
The entered primary DNS server address is valid.',
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index acbf6f5b5..5c5d2e3f4 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -502,46 +502,45 @@ update_safe_search() {
unbound-control local_zone_remove "${domain}"
done >/dev/null
- # Nothing to do if safe search is not enabled
- if [ "${ENABLE_SAFE_SEARCH}" != "on" ]; then
- return 0
+ if [ "${ENABLE_SAFE_SEARCH}" = "on" ]; then
+ # Bing
+ unbound-control bing.com transparent >/dev/null
+ for address in $(resolve "strict.bing.com"); do
+ unbound-control local_data "www.bing.com ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+
+ # DuckDuckGo
+ unbound-control local_zone duckduckgo.com typetransparent >/dev/null
+ for address in $(resolve "safe.duckduckgo.com"); do
+ unbound-control local_data "duckduckgo.com ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+
+ # Google
+ local addresses="$(resolve "forcesafesearch.google.com")"
+ for domain in ${google_tlds[@]}; do
+ unbound-control local_zone "${domain}" transparent >/dev/null
+ for address in ${addresses}; do
+ unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+ done
+
+ # Yandex
+ for domain in yandex.com yandex.ru; do
+ unbound-control local_zone "${domain}" typetransparent >/dev/null
+ for address in $(resolve "familysearch.${domain}"); do
+ unbound-control local_data "${domain} ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+ done
+
+ # YouTube
+ if [ "${ENABLE_SAFE_SEARCH_YOUTUBE}" = "on" ]; then
+ unbound-control local_zone youtube.com transparent >/dev/null
+ for address in $(resolve "restrictmoderate.youtube.com"); do
+ unbound-control local_data "www.youtube.com ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+ fi
fi
- # Bing
- unbound-control bing.com transparent >/dev/null
- for address in $(resolve "strict.bing.com"); do
- unbound-control local_data "www.bing.com ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
-
- # DuckDuckGo
- unbound-control local_zone duckduckgo.com typetransparent >/dev/null
- for address in $(resolve "safe.duckduckgo.com"); do
- unbound-control local_data "duckduckgo.com ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
-
- # Google
- local addresses="$(resolve "forcesafesearch.google.com")"
- for domain in ${google_tlds[@]}; do
- unbound-control local_zone "${domain}" transparent >/dev/null
- for address in ${addresses}; do
- unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
- done
-
- # Yandex
- for domain in yandex.com yandex.ru; do
- unbound-control local_zone "${domain}" typetransparent >/dev/null
- for address in $(resolve "familysearch.${domain}"); do
- unbound-control local_data "${domain} ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
- done
-
- # YouTube
- unbound-control local_zone youtube.com transparent >/dev/null
- for address in $(resolve "restrictmoderate.youtube.com"); do
- unbound-control local_data "www.youtube.com ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
-
return 0
}
|