From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 29 Jul 2019 22:15:15 +0000 (-0700)
Subject: Remove ExtensionSettings for now
X-Git-Tag: v1.8.2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/refs/tags/v1.8.2

Remove ExtensionSettings for now
---

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 7d0bcad..cffd8c2 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -179,27 +179,6 @@
 			<string>firefox@ghostery.com</string>
 		</array>
 	</dict>
-	<key>ExtensionSettings</key>
-	<dict>
-		<key>*</key>
-		<dict>
-			<key>blocked_install_message</key>
-			<string>Custom error message.</string>
-			<key>install_sources</key>
-			<array>
-				<string>https://addons.mozilla.org/</string>
-			</array>
-			<key>installation_mode</key>
-			<string>blocked</string>
-		</dict>
-		<key>uBlock0@raymondhill.net</key>
-		<dict>
-			<key>installation_mode</key>
-			 <string>force_installed</string>
-			<key>install_url</key>
-			<string>https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi</string>
-		</dict>
-	</dict>
 	<key>ExtensionUpdate</key>
 	<false/>
 	<key>FirefoxHome</key>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 8b5a401..c1d10cb 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -664,14 +664,15 @@
         <list id="Extensions" key="Software\Policies\Mozilla\Firefox\Extensions\Locked" valuePrefix=""/>
       </elements>
     </policy>
+    <!--
     <policy name="ExtensionSettings" class="Both" displayName="$(string.ExtensionSettings)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExtensionSettings_Explain)"  presentation="$(presentation.ExtensionSettings)">">
       <parentCategory ref="Extensions"/>
       <supportedOn ref="SUPPORTED_FF6801"/>
       <elements>
-<!--        <multiText id="ExtensionSettings" valueName="ExtensionSettings" /> -->
-        <text id="ExtensionSettings" valueName="ExtensionSettings" />
+        <multiText id="ExtensionSettings" valueName="ExtensionSettings" />
       </elements>
     </policy>
+    -->
     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>