From: Michael Kaply <consulting@kaply.com>
Date: Tue, 21 May 2019 20:29:48 +0000 (-0700)
Subject: Merge pull request #374 from mozilla/67_updates
X-Git-Tag: v1.7~5
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/aa960c6c5c300679ef4e885c4f762bdc058b6c35?hp=560e8c3ca69e6449596b1365c7b1184c7be6f5d8

Merge pull request #374 from mozilla/67_updates

Updates for Firefox 67/60.7
---

diff --git a/README.md b/README.md
index 6e7ef5c..ef19a94 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,14 @@ same folder name are grouped together.
   }
 }
 ```
+### CaptivePortal
+This policy enables or disables captive portal support by setting and locking the preference `network.captive-portal-service.enabled`.
+```
+{
+  "policies": {
+    "CaptivePortal": [true|false]
+}
+```
 ### Certificates
 This policy can be used to install certificates or to read certificates from the system certificate store on Mac and Windows.
 
@@ -399,6 +407,14 @@ For Uninstall and Locked, you specify extension IDs.
   }
 }
 ```
+### ExtensionUpdate
+This policy enables or disables extension updates by setting and locking the preference `extensions.update.enabled`.
+```
+{
+  "policies": {
+    "ExtensionUpdate": [true|false]
+}
+```
 ### HardwareAcceleration
 This policy disables hardware acceleration by locking the preference layers.acceleration.disabled to true.
 ```
@@ -482,6 +498,14 @@ This policy sets the behavior of Flash on the specified domains, as well as the
   }
 }
 ```
+### NetworkPrediction
+This policy enables or disables network prediction (DNS prefetching) by setting and locking the preferences `network.dns.disablePrefetch` and `network.dns.disablePrefetchFromHTTPS`.
+```
+{
+  "policies": {
+    "NetworkPrediction": [true|false]
+}
+```
 ### OverrideFirstRunPage
 This policy allows you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
 ```
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 2195d4d..7b0bef2 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -66,6 +66,8 @@
 			<string>Example2Folder</string>
 		</dict>
 	</array>
+	<key>CaptivePortal</key>
+	<false/>
 	<key>Certificates</key>
 	<dict>
 		<key>ImportEnterpriseRoots</key>
@@ -173,6 +175,8 @@
 			<string>firefox@ghostery.com</string>
 		</array>
 	</dict>
+	<key>ExtensionUpdate</key>
+	<false/>
 	<key>FlashPlugin</key>
 	<dict>
 		<key>Allow</key>
@@ -215,6 +219,8 @@
 		<key>Default</key>
 		<false/>
 	</dict>
+	<key>NetworkPrediction</key>
+	<false/>
 	<key>NoDefaultBookmarks</key>
 	<true/>
 	<key>OfferToSaveLogins</key>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 280cba4..3f6572f 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="1.4" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.5" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -10,6 +10,7 @@
       <string id="SUPPORTED_FF63">Firefox 63 or later</string>
       <string id="SUPPORTED_FF64">Firefox 64 or later, Firefox 60.4 ESR or later</string>
       <string id="SUPPORTED_FF66">Firefox 66 or later, Firefox 60.6 ESR or later</string>
+      <string id="SUPPORTED_FF67">Firefox 67 or later, Firefox 60.7 ESR or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
@@ -75,6 +76,10 @@ If this policy is disabled or not configured, the user can access Troubleshootin
       <string id="DisableSetDesktopBackground_Explain">If this policy is enabled, the user cannot set an image as their desktop background.
 
 If this policy is disabled or not configured, users can set images as their desktop background.</string>
+      <string id="CaptivePortal">Captive Portal</string>
+      <string id="CaptivePortal_Explain">If this policy is disabled, captive portal support is disabled.
+
+If this policy is enabled or not configured, captive portal support is enabled.</string>
       <string id="Certificates_ImportEnterpriseRoots">Import Enterprise Roots</string>
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
@@ -193,10 +198,18 @@ If this policy is disabled or not configured, no extensions are uninstalled.</st
       <string id="Extensions_Locked_Explain">If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable.
 
 If this policy is disabled or not configured, no extensions are locked</string>
+      <string id="ExtensionUpdate">Extension Update</string>
+      <string id="ExtensionUpdate_Explain">If this policy is disabled, extensions will not be updated automatically.
+
+If this policy is enabled or not configured, extensions will be updated automatically.</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
 If this policy is enabled or not configured, hardware acceleration is enabled.</string>
+      <string id="NetworkPrediction">Network Prediction</string>
+      <string id="NetworkPrediction_Explain">If this policy is disabled, network prediction (DNS prefetching) will be disabled.
+
+If this policy is enabled or not configured, network prediction (DNS prefetching) will be enabled.</string>
       <string id="OfferToSaveLogins">Offer to save logins</string>
       <string id="OfferToSaveLogins_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index c6caf2c..383ba17 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="1.4" schemaVersion="1.0">
+<policyDefinitions revision="1.5" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
@@ -14,6 +14,7 @@
       <definition name="SUPPORTED_FF63" displayName="$(string.SUPPORTED_FF63)"/>
       <definition name="SUPPORTED_FF64" displayName="$(string.SUPPORTED_FF64)"/>
       <definition name="SUPPORTED_FF66" displayName="$(string.SUPPORTED_FF66)"/>
+      <definition name="SUPPORTED_FF67" displayName="$(string.SUPPORTED_FF67)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -151,6 +152,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="CaptivePortal" class="Both" displayName="$(string.CaptivePortal)" explainText="$(string.CaptivePortal_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="CaptivePortal">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF67"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="Certificates_ImportEnterpriseRoots" class="Both" displayName="$(string.Certificates_ImportEnterpriseRoots)" explainText="$(string.Certificates_ImportEnterpriseRoots_Explain)" key="Software\Policies\Mozilla\Firefox\Certificates" valueName="ImportEnterpriseRoots">
       <parentCategory ref="Certificates"/>
       <supportedOn ref="SUPPORTED_FF60"/>
@@ -655,6 +666,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="ExtensionUpdate" class="Both" displayName="$(string.ExtensionUpdate)" explainText="$(string.ExtensionUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="ExtensionUpdate">
+      <parentCategory ref="Extensions"/>
+      <supportedOn ref="SUPPORTED_FF67"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="NetworkPrediction" class="Both" displayName="$(string.NetworkPrediction)" explainText="$(string.NetworkPrediction_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NetworkPrediction">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF67"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>    
     <policy name="OfferToSaveLogins" class="Both" displayName="$(string.OfferToSaveLogins)" explainText="$(string.OfferToSaveLogins_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="OfferToSaveLogins">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>