From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 29 Jun 2023 15:57:44 +0000 (-0400) Subject: Merge branch 'master' of github.com:mozilla/policy-templates X-Git-Tag: v5.0~4 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/10994ad4dd35d60d01114e0db206de01dfc6a320?ds=inline;hp=-c Merge branch 'master' of github.com:mozilla/policy-templates --- 10994ad4dd35d60d01114e0db206de01dfc6a320 diff --combined README.md index 9a15db7,e660b84..e0af1d4 --- a/README.md +++ b/README.md @@@ -81,6 -81,7 +81,6 @@@ Unfortunately, JSON files do not suppor | **[`ExtensionSettings`](#extensionsettings)** | Manage all aspects of extensions. | **[`ExtensionUpdate`](#extensionupdate)** | Control extension updates. | **[`FirefoxHome`](#firefoxhome)** | Customize the Firefox Home page. -| **[`FlashPlugin (Deprecated)`](#flashplugin-deprecated)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed. | **[`GoToIntranetSiteForSingleWordEntryInAddressBar`](#gotointranetsiteforsinglewordentryinaddressbar)** | Force direct intranet site navigation instead of searching when typing single word entries in the address bar. | **[`Handlers`](#handlers)** | Configure default application handlers. | **[`HardwareAcceleration`](#hardwareacceleration)** | Control hardware acceleration. @@@ -3047,6 -3048,87 +3047,6 @@@ Value (string) } } ``` -### FlashPlugin (Deprecated) -Configure the default Flash plugin policy as well as origins for which Flash is allowed. - -`Allow` is a list of origins where Flash are allowed. - -`Block` is a list of origins where Flash is not allowed. - -`Default` determines whether or not Flash is allowed by default. - -`Locked` prevents the user from changing Flash preferences. - -**Compatibility:** Firefox 60, Firefox ESR 60\ -**CCK2 Equivalent:** `permissions.plugin`\ -**Preferences Affected:** `plugin.state.flash` - -#### Windows (GPO) -``` -Software\Policies\Mozilla\Firefox\FlashPlugin\Allow\1 = "https://example.org" -Software\Policies\Mozilla\Firefox\FlashPlugin\Block\1 = "https://example.edu" -Software\Policies\Mozilla\Firefox\FlashPlugin\Default = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FlashPlugin\Locked = 0x1 | 0x0 -``` -#### Windows (Intune) -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Allow -``` -Value (string): -``` - - -``` -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Locked -``` -Value (string): -``` - or -``` -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Default -``` -Value (string): -``` - or -``` -#### macOS -``` - - FlashPlugin - - Allow - - http://example.org - - Block - - http://example.edu - - Default - | - Locked - | - - -``` -#### policies.json -``` -{ - "policies": { - "FlashPlugin": { - "Allow": ["http://example.org/"], - "Block": ["http://example.edu/"], - "Default": true | false, - "Locked": true | false - } - } -} -``` ### GoToIntranetSiteForSingleWordEntryInAddressBar Whether to always go through the DNS server before sending a single word search string to a search engine. @@@ -6059,6 -6141,8 +6059,8 @@@ Prevent Firefox from messaging the use `MoreFromMozilla` If false, don't show the "More from Mozilla" section in Preferences. (Firefox 98) + `Locked` prevents the user from changing user messaging preferences. + **Compatibility:** Firefox 75, Firefox ESR 68.7\ **CCK2 Equivalent:** N/A\ **Preferences Affected:** `browser.messaging-system.whatsNewPanel.enabled`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features`, `browser.aboutwelcome.enabled`, `browser.preferences.moreFromMozilla` @@@ -6071,6 -6155,7 +6073,7 @@@ Software\Policies\Mozilla\Firefox\UserM Software\Policies\Mozilla\Firefox\UserMessaging\UrlbarInterventions = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\SkipOnboarding = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\MoreFromMozilla = 0x1 | 0x0 + Software\Policies\Mozilla\Firefox\UserMessaging\Locked = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: @@@ -6081,6 -6166,7 +6084,7 @@@ ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_UrlbarInterventions ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_SkipOnboarding ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_MoreFromMozilla + ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_Locked ``` Value (string): ``` @@@ -6103,6 -6189,8 +6107,8 @@@ | MoreFromMozilla | + Locked + | ``` @@@ -6116,7 -6204,8 +6122,8 @@@ "FeatureRecommendations": true | false, "UrlbarInterventions": true | false, "SkipOnboarding": true | false, - "MoreFromMozilla": true | false + "MoreFromMozilla": true | false, + "Locked": true | false } } } diff --combined docs/index.md index bdef353,097bda4..d072e89 --- a/docs/index.md +++ b/docs/index.md @@@ -73,6 -73,7 +73,6 @@@ Unfortunately, JSON files do not suppor | **[`ExtensionSettings`](#extensionsettings)** | Manage all aspects of extensions. | **[`ExtensionUpdate`](#extensionupdate)** | Control extension updates. | **[`FirefoxHome`](#firefoxhome)** | Customize the Firefox Home page. -| **[`FlashPlugin (Deprecated)`](#flashplugin-deprecated)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed. | **[`GoToIntranetSiteForSingleWordEntryInAddressBar`](#gotointranetsiteforsinglewordentryinaddressbar)** | Force direct intranet site navigation instead of searching when typing single word entries in the address bar. | **[`Handlers`](#handlers)** | Configure default application handlers. | **[`HardwareAcceleration`](#hardwareacceleration)** | Control hardware acceleration. @@@ -3039,6 -3040,87 +3039,6 @@@ Value (string) } } ``` -### FlashPlugin (Deprecated) -Configure the default Flash plugin policy as well as origins for which Flash is allowed. - -`Allow` is a list of origins where Flash are allowed. - -`Block` is a list of origins where Flash is not allowed. - -`Default` determines whether or not Flash is allowed by default. - -`Locked` prevents the user from changing Flash preferences. - -**Compatibility:** Firefox 60, Firefox ESR 60\ -**CCK2 Equivalent:** `permissions.plugin`\ -**Preferences Affected:** `plugin.state.flash` - -#### Windows (GPO) -``` -Software\Policies\Mozilla\Firefox\FlashPlugin\Allow\1 = "https://example.org" -Software\Policies\Mozilla\Firefox\FlashPlugin\Block\1 = "https://example.edu" -Software\Policies\Mozilla\Firefox\FlashPlugin\Default = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FlashPlugin\Locked = 0x1 | 0x0 -``` -#### Windows (Intune) -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Allow -``` -Value (string): -``` - - -``` -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Locked -``` -Value (string): -``` - or -``` -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Default -``` -Value (string): -``` - or -``` -#### macOS -``` - - FlashPlugin - - Allow - - http://example.org - - Block - - http://example.edu - - Default - | - Locked - | - - -``` -#### policies.json -``` -{ - "policies": { - "FlashPlugin": { - "Allow": ["http://example.org/"], - "Block": ["http://example.edu/"], - "Default": true | false, - "Locked": true | false - } - } -} -``` ### GoToIntranetSiteForSingleWordEntryInAddressBar Whether to always go through the DNS server before sending a single word search string to a search engine. @@@ -6001,6 -6083,8 +6001,8 @@@ Prevent Firefox from messaging the use `MoreFromMozilla` If false, don't show the "More from Mozilla" section in Preferences. (Firefox 98) + `Locked` prevents the user from changing user messaging preferences. + **Compatibility:** Firefox 75, Firefox ESR 68.7\ **CCK2 Equivalent:** N/A\ **Preferences Affected:** `browser.messaging-system.whatsNewPanel.enabled`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features`, `browser.aboutwelcome.enabled`, `browser.preferences.moreFromMozilla` @@@ -6013,6 -6097,7 +6015,7 @@@ Software\Policies\Mozilla\Firefox\UserM Software\Policies\Mozilla\Firefox\UserMessaging\UrlbarInterventions = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\SkipOnboarding = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\UserMessaging\MoreFromMozilla = 0x1 | 0x0 + Software\Policies\Mozilla\Firefox\UserMessaging\Locked = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: @@@ -6023,6 -6108,7 +6026,7 @@@ ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_UrlbarInterventions ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_SkipOnboarding ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_MoreFromMozilla + ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_Locked ``` Value (string): ``` @@@ -6045,6 -6131,8 +6049,8 @@@ | MoreFromMozilla | + Locked + | ``` @@@ -6058,7 -6146,8 +6064,8 @@@ "FeatureRecommendations": true | false, "UrlbarInterventions": true | false, "SkipOnboarding": true | false, - "MoreFromMozilla": true | false + "MoreFromMozilla": true | false, + "Locked": true | false } } } diff --combined mac/org.mozilla.firefox.plist index c5b61a6,b37abd9..dc02907 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@@ -320,6 -320,21 +320,6 @@@ Locked - FlashPlugin - - Allow - - https://www.example.com - - Block - - https://www.example.org - - Default - - Locked - - GoToIntranetSiteForSingleWordEntryInAddressBar Handlers @@@ -603,6 -618,10 +603,10 @@@ SkipOnboarding + MoreFromMozilla + + Locked + UseSystemPrintDialog