]> git.p6c8.net - policy-templates.git/commitdiff
git.p6c8.net / policy-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 863881b 14aeae9)
Merge branch 'master' of github.com:mozilla/policy-templates
authorMichael Kaply <345868+mkaply@users.noreply.github.com>
Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
committerMichael Kaply <345868+mkaply@users.noreply.github.com>
Thu, 29 Jun 2023 15:57:44 +0000 (11:57 -0400)
1  2 
README.md patch | diff1 | diff2 | blob | history
docs/index.md patch | diff1 | diff2 | blob | history
mac/org.mozilla.firefox.plist patch | diff1 | diff2 | blob | history

diff --combined README.md
index 9a15db73d8ef411d217ecc384545cfd641760553,e660b84e0d37e6da8502dbb06ae40fd037c2a79d..e0af1d4b1d531c7f1aa9e88d0964f78763d90a49
--- 1/README.md
--- 2/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):
 -```
 -<enabled/>
 -<data id="Permissions" value="1&#xF000;https://example.org&#xF000;2&#xF000;https://example.edu"/>
 -```
 -OMA-URI:
 -```
 -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Locked
 -```
 -Value (string):
 -```
 -<enabled/> or <disabled/>
 -```
 -OMA-URI:
 -```
 -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Default
 -```
 -Value (string):
 -```
 -<enabled/> or <disabled/>
 -```
 -#### macOS
 -```
 -<dict>
 -  <key>FlashPlugin</key>
 -  <dict>
 -    <key>Allow</key>
 -    <array>
 -      <string>http://example.org</string>
 -    </array>
 -    <key>Block</key>
 -    <array>
 -      <string>http://example.edu</string>
 -    </array>
 -    <key>Default</key>
 -    <true/> | <false/>
 -    <key>Locked</key>
 -    <true/> | <false/>
 -  </dict>
 -</dict>
 -```
 -#### 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 @@@
      <true/> | <false/>
      <key>MoreFromMozilla</key>
      <true/> | <false/>
+     <key>Locked</key>
+     <true/> | <false/>
    </dict>
  </dict>
  ```
@@@ -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 bdef353a8fa3b889a12373e8d74517331ea236cf,097bda4feff6e697f94f2bf6fec0471708e059d3..d072e89271695d3fc85a01502ca6a2b9b31ec17b
--- 1/docs/index.md
--- 2/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):
 -```
 -<enabled/>
 -<data id="Permissions" value="1&#xF000;https://example.org&#xF000;2&#xF000;https://example.edu"/>
 -```
 -OMA-URI:
 -```
 -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Locked
 -```
 -Value (string):
 -```
 -<enabled/> or <disabled/>
 -```
 -OMA-URI:
 -```
 -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Default
 -```
 -Value (string):
 -```
 -<enabled/> or <disabled/>
 -```
 -#### macOS
 -```
 -<dict>
 -  <key>FlashPlugin</key>
 -  <dict>
 -    <key>Allow</key>
 -    <array>
 -      <string>http://example.org</string>
 -    </array>
 -    <key>Block</key>
 -    <array>
 -      <string>http://example.edu</string>
 -    </array>
 -    <key>Default</key>
 -    <true/> | <false/>
 -    <key>Locked</key>
 -    <true/> | <false/>
 -  </dict>
 -</dict>
 -```
 -#### 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 @@@
      <true/> | <false/>
      <key>MoreFromMozilla</key>
      <true/> | <false/>
+     <key>Locked</key>
+     <true/> | <false/>
    </dict>
  </dict>
  ```
@@@ -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 c5b61a6524abd16a5f2fc197e931109c868705ff,b37abd962ca5411927d030b3c72a55ee63c6ed91..dc029077dd716eb530a10270c728d7250fdae384
--- 1/mac/org.mozilla.firefox.plist
--- 2/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@@ -320,6 -320,21 +320,6 @@@
                <key>Locked</key>
                <true/>
        </dict>
 -      <key>FlashPlugin</key>
 -      <dict>
 -              <key>Allow</key>
 -              <array>
 -                      <string>https://www.example.com</string>
 -              </array>
 -              <key>Block</key>
 -              <array>
 -                      <string>https://www.example.org</string>
 -              </array>
 -              <key>Default</key>
 -              <true/>
 -              <key>Locked</key>
 -              <true/>
 -      </dict>
        <key>GoToIntranetSiteForSingleWordEntryInAddressBar</key>
        <true/>
        <key>Handlers</key>
@@@ -603,6 -618,10 +603,10 @@@
                <false/>
                <key>SkipOnboarding</key>
                <true/>
+               <key>MoreFromMozilla</key>
+               <true/>
+               <key>Locked</key>
+               <true/>
        </dict>
        <key>UseSystemPrintDialog</key>
        <true/>
My copy of the policy templates for Firefox

patrick-canterino.de