From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 23 Apr 2020 20:56:39 +0000 (-0500) Subject: Merge pull request #585 from mozilla/DisabledCiphers X-Git-Tag: v1.16~3 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/426f88e4358468dbaa352171dbc1ff4ff336771f?hp=1d9b83d48cea47298080da9aaf22b0bf1db810d3 Merge pull request #585 from mozilla/DisabledCiphers Initial checkin of new policy DisabledCiphers --- diff --git a/README.md b/README.md index f572339..089b93c 100644 --- a/README.md +++ b/README.md @@ -2181,9 +2181,11 @@ Set permissions associated with camera, microphone, location, notifications, and `Locked` prevents the user from changing preferences for the feature. -**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6\ +`Default` specifies the default value for Autoplay. block-audio-video is not supported on Firefox ESR 68. + +**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6, Autoplay Default/Locked added in Firefox 76, Firefox ESR 68.8)\ **CCK2 Equivalent:** N/A\ -**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification` +**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`,`media.autoplay.default` #### Windows (GPO) ``` @@ -2206,6 +2208,8 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\BlockNewRequests = 0 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org" Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu" +Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Default = "allow-audio-video" | "block-audio" | "block-audio-video" +Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Locked = 0x1 | 0x0 ``` #### macOS ``` @@ -2224,9 +2228,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu BlockNewRequests - + | Locked - + | Microphone @@ -2239,9 +2243,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu BlockNewRequests - + | Locked - + | Location @@ -2254,9 +2258,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu BlockNewRequests - + | Locked - + | Notifications @@ -2283,6 +2287,10 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl https://example.edu + Default + allow-audio-video | block-audio | block-audio-video + Locked + | @@ -2318,7 +2326,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl }, "Autoplay": { "Allow": ["https://example.org"], - "Block": ["https://example.edu"] + "Block": ["https://example.edu"], + "Default": "allow-audio-video" | "block-audio" | "block-audio-video", + "Locked": true | false } } } diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index ec4d852..17343d3 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -398,6 +398,10 @@ https://example.edu + Default + block-audio + Locked + PopupBlocking diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 6b2aa39..c9b7b18 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -423,6 +423,19 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird Wenn diese Richtlinieneinstellung aktiviert ist, ist die Automatische Wiedergabe für die genannten Quellen immer deaktiviert. Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert, wird die Standardeinstellung zur Automatischen Wiedergabe von Medien befolgt. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Firefox Home anpassen Wenn diese Richtlinieneinstellung aktiviert ist, können die Sektionen festgelegt werden, die der Anwender sieht und der Anwender kann diese nicht mehr anpassen. @@ -1043,6 +1056,9 @@ 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 c44ba4f..7c5dae1 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -423,6 +423,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol If this policy is enabled, autoplay is always blocked for the origins indicated. If this policy is disabled or not configured, the default autoplay policy is followed. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Customize Firefox Home If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them. @@ -1044,6 +1057,9 @@ 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 b52ea67..9bed40a 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -423,6 +423,19 @@ Si esta política está deshabilitada o no está configurada, se seguirá la pol Si esta política está habilitada, la reproducción automática siempre se bloqueará para los orígenes indicados. Si esta política está deshabilitada o no está configurada, se seguirá la política predeterminada de reproducción automática. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Personalizar inicio de Firefox Si esta política está habilitada, podrá elegir las secciones que se muestran en la página de inicio de Firefox e impedir que el usuario las cambie. @@ -1044,6 +1057,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/firefox.admx b/windows/firefox.admx index f18d859..77ed391 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -481,6 +481,39 @@ + + + + + + + + + + + + + + + + + + allow-audio-video + + + + + block-audio + + + + + block-audio-video + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index c951f80..fcb3504 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -423,6 +423,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol If this policy is enabled, autoplay is always blocked for the origins indicated. If this policy is disabled or not configured, the default autoplay policy is followed. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Customize Firefox Home If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them. @@ -1044,6 +1057,9 @@ 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 b46d4be..4e5d70b 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -423,6 +423,19 @@ Se questo criterio è disabilitato o non configurato, viene seguito il criterio Se questo criterio è abilitato, la riproduzione automatica sarà sempre bloccata per le origini indicate. Se questo criterio è disabilitato o non configurato, viene seguito il criterio predefinito per la riproduzione automatica. + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video Personalizza pagina iniziale di Firefox Se questo criterio è abilitato, è possibile scegliere le sezioni visualizzate nella pagina iniziale di Firefox e impedire all'utente di modificarle. @@ -1044,6 +1057,9 @@ 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 7c07f39..b1da63f 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -421,6 +421,19 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用此原則，將永遠針對指定的來源封鎖自動播放。 若停用或不設定此原則，將遵循預設自動播放原則。 + Default autoplay level + If this policy is enabled, you can choose the default autoplay level. + +If this policy is disabled or not configured, audio is blocked by default. + +Note: Blocking audio and video does not work on the ESR. + Do not allow preferences to be changed + If this policy is enabled, autoplay preferences cannot be changed by the user. + +If this policy is disabled or not configured, the user can change autoplay preferences. + Allow Audio and Video + Block Audio + Block Audio and Video 自訂 Firefox 首頁 若啟用此原則，將可以設定要在 Firefox 首頁顯示哪些段落，並防止使用者更改設定。 @@ -1042,6 +1055,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 + + + \ No newline at end of file