From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Mon, 6 Apr 2020 20:31:42 +0000 (-0500) Subject: Merge branch 'master' into DNSOverHTTPS_ExcludedDomains X-Git-Tag: v1.15~9^2 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/1a0722e4ce84218f68ad588386c5f0c77e4cb657?hp=269ce4f833b3767afe14cb78bd11d3db6c2a7c19 Merge branch 'master' into DNSOverHTTPS_ExcludedDomains --- diff --git a/README.md b/README.md index df2ccf4..3ec9588 100644 --- a/README.md +++ b/README.md @@ -1239,7 +1239,9 @@ Configure DNS over HTTPS. `Locked` prevents the user from changing DNS over HTTPS preferences. -**Compatibility:** Firefox 63, Firefox ESR 68\ +`ExcludedDomains` excludes domains from DNS over HTTPS. + +**Compatibility:** Firefox 63, Firefox ESR 68 (ExcludedDomains added in 75/68.7)\ **CCK2 Equivalent:** N/A\ **Preferences Affected:** `network.trr.mode`,`network.trr.uri` @@ -1248,6 +1250,7 @@ Configure DNS over HTTPS. Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Enabled = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ProviderURL = "URL_TO_ALTERNATE_PROVIDER" Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ExcludedDomains\1 = "example.com" ``` #### macOS ``` @@ -1260,6 +1263,10 @@ Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0 URL_TO_ALTERNATE_PROVIDER Locked | + ExcludedDomains + + example.com + ``` @@ -1270,7 +1277,8 @@ Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0 "DNSOverHTTPS": { "Enabled": true | false, "ProviderURL": "URL_TO_ALTERNATE_PROVIDER", - "Locked": true | false + "Locked": true | false, + "ExcludedDomains": ["example.com"] } } } diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 1fb7f4d..a0813c1 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -122,6 +122,10 @@ URL_TO_ALTERNATE_PROVIDER Locked + ExcludedDomains + + example.com + DisableAppUpdate diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 98a4b80..8778bfd 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -127,7 +127,25 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird Wenn Sie die Richtlinieneinstellung aktivieren, können Sie das Standard Verzeichnis für Downloads definieren und sperren. ${home} kann für den nativen Profilpfad verwendet werden. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird das Standard Firefox Download Verzeichnis benutzt und der Benutzer kann dies ändern. - DNS Over HTTPS konfigurieren + DNS Over HTTPS + Enabled + If this policy is disabled, DNS over HTTPS is disabled. + +If this policy is enabled or not configured, DNS Over HTTPS is enabled. + Provider URL + If this policy is enabled, the URL specified is used as the provider URL. + +If this policy is disabled or not configured, the default provider is used. + + Locked + If this policy is enabled, DNS over HTTPS settings cannot be changed by the user. + +If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user. + Excluded Domains + If this policy is enabled, the specified domains are excluded from DNS over HTTPS. + +If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS. + DNS Over HTTPS konfigurieren (Moved) Wenn Sie die Richtlinieneinstellung aktivieren, können die Standardeinstellungen für DNS over HTTPS geändert werden. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden von Mozilla Firefox die Standardeinstellungen zu DNS Over HTTPS benutzt. @@ -980,6 +998,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E + + + + + + + diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 1147813..1409495 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -127,7 +127,25 @@ If this policy is disabled or not configured, the default Firefox download direc If this policy is enabled, you can set and lock the directory for downloads. ${home} can be used for the native home path. If this policy is disabled or not configured, the default Firefox download directory is used and the user can change it. - Configure DNS Over HTTPS + DNS Over HTTPS + Enabled + If this policy is disabled, DNS over HTTPS is disabled. + +If this policy is enabled or not configured, DNS Over HTTPS is enabled. + Provider URL + If this policy is enabled, the URL specified is used as the provider URL. + +If this policy is disabled or not configured, the default provider is used. + + Locked + If this policy is enabled, DNS over HTTPS settings cannot be changed by the user. + +If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user. + Excluded Domains + If this policy is enabled, the specified domains are excluded from DNS over HTTPS. + +If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS. + Configure DNS Over HTTPS (Moved) If this policy is enabled, the default configuration for DNS over HTTPS can be changed. If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration. @@ -981,6 +999,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. + + + + + + + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index f7504e6..0ab27a5 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -127,7 +127,25 @@ Si esta política está deshabilitada o no está configurada, se utilizará el d Si esta política está habilitada, podrá configurar y bloquear el directorio para las descargas. ${home} se puede utilizar para la ruta de inicio nativa. Si esta política está deshabilitada o no está configurada, se utilizará el directorio de descarga predeterminado de Firefox y el usuario puede cambiarlo. - Configurar DNS mediante HTTPS + DNS Over HTTPS + Enabled + If this policy is disabled, DNS over HTTPS is disabled. + +If this policy is enabled or not configured, DNS Over HTTPS is enabled. + Provider URL + If this policy is enabled, the URL specified is used as the provider URL. + +If this policy is disabled or not configured, the default provider is used. + + Locked + If this policy is enabled, DNS over HTTPS settings cannot be changed by the user. + +If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user. + Excluded Domains + If this policy is enabled, the specified domains are excluded from DNS over HTTPS. + +If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS. + Configurar DNS mediante HTTPS (Moved) Si esta política está habilitada, se podrá cambiar la configuración predeterminada de DNS mediante HTTPS. Si esta política está deshabilitada o no está configurada, DNS mediante HTTPS usa la configuración predeterminada de Firefox. @@ -981,6 +999,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + + + + + diff --git a/windows/firefox.admx b/windows/firefox.admx index 36948d5..8e9567a 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -91,6 +91,9 @@ + + + @@ -489,6 +492,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 6677c4a..18398a0 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -127,7 +127,25 @@ Si cette stratégie est désactivée ou non configurée, le répertoire de tél Si cette stratégie est activée, vous pouvez définir et verrouiller le répertoire de téléchargement. ${home} peut être utilisé comme chemin de base. Si cette stratégie est désactivée ou non configurée, le répertoire de téléchargement par défaut de Firefox est utilisé et l'uilisateur peut le modifier. - Configurer DNS sur HTTPS + DNS Over HTTPS + Enabled + If this policy is disabled, DNS over HTTPS is disabled. + +If this policy is enabled or not configured, DNS Over HTTPS is enabled. + Provider URL + If this policy is enabled, the URL specified is used as the provider URL. + +If this policy is disabled or not configured, the default provider is used. + + Locked + If this policy is enabled, DNS over HTTPS settings cannot be changed by the user. + +If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user. + Excluded Domains + If this policy is enabled, the specified domains are excluded from DNS over HTTPS. + +If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS. + Configurer DNS sur HTTPS (Moved) Si cette stratégie est activée, la configuration par défaut de DNS sur HTTPS peut être modifiée. Si cette stratégie est désactivée ou non configurée, DNS Over HTTPS utilise la configuration par défaut de Firefox. @@ -981,6 +999,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + + + + + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 48c6f6a..ee1a97b 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -127,7 +127,25 @@ Se questo criterio è disabilitato o non configurato, Firefox utilizzerà la dir Se questo criterio è abilitato, è possibile impostare e rendere non modificabile la directory per i download. È possibile usare ${home} per specificare il percorso nativo della directory utente. Se questo criterio è disabilitato o non configurato, Firefox utilizzerà la directory di download predefinita e l'utente sarà in grado di modificarla. - Configura DNS su HTTPS + DNS Over HTTPS + Enabled + If this policy is disabled, DNS over HTTPS is disabled. + +If this policy is enabled or not configured, DNS Over HTTPS is enabled. + Provider URL + If this policy is enabled, the URL specified is used as the provider URL. + +If this policy is disabled or not configured, the default provider is used. + + Locked + If this policy is enabled, DNS over HTTPS settings cannot be changed by the user. + +If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user. + Excluded Domains + If this policy is enabled, the specified domains are excluded from DNS over HTTPS. + +If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS. + Configura DNS su HTTPS (Moved) Se questo criterio è abilitato, la configurazione predefinita per DNS su HTTPS può essere modificata. Se questo criterio è disabilitato o non configurato, DNS su HTTPS utilizza la configurazione predefinita di Firefox. @@ -981,6 +999,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + + + + + diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index 67a9bb7..760759b 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -127,7 +127,25 @@ If this policy is enabled or not configured, authentication preferences cannot b 若啟用此原則，可設定並固定下載項目的預設儲存資料夾。可使用 ${home} 來指定家目錄。 若停用或不設定此原則，將使用 Firefox 的預設下載資料夾，且可由使用者變更。 - 設定 DNS Over HTTPS + DNS Over HTTPS + Enabled + If this policy is disabled, DNS over HTTPS is disabled. + +If this policy is enabled or not configured, DNS Over HTTPS is enabled. + Provider URL + If this policy is enabled, the URL specified is used as the provider URL. + +If this policy is disabled or not configured, the default provider is used. + + Locked + If this policy is enabled, DNS over HTTPS settings cannot be changed by the user. + +If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user. + Excluded Domains + If this policy is enabled, the specified domains are excluded from DNS over HTTPS. + +If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS. + 設定 DNS Over HTTPS (Moved) 若啟用此原則，可變更預設 DNS over HTTPS 設定。 若停用或不設定此原則，將使用預設 DNS Over HTTPS 設定。 @@ -979,6 +997,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 + + + + + + + \ No newline at end of file