Restore Previous settings

6 files changed, 35 insertions, 17 deletions

diff --git a/browser/linux/resources/settings_scripts/disable_settings.sh b/browser/linux/resources/settings_scripts/disable_settings.sh
deleted file mode 100755
index 8fc23ac..0000000
--- a/browser/linux/resources/settings_scripts/disable_settings.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-mv ./defaults/pref/local-settings.js ./settings/defaults/pref/local-settings.js;
-mv ./distribution/policies.json ./settings/distribution/policies.json;
-mv ./librewolf.cfg ./settings/librewolf.cfg;
-
diff --git a/browser/linux/resources/settings_scripts/enable_settings.sh b/browser/linux/resources/settings_scripts/enable_settings.sh
deleted file mode 100755
index adfeb9c..0000000
--- a/browser/linux/resources/settings_scripts/enable_settings.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cp -r ./defaults/pref/local-settings.js ../
-cp -r ./distribution/policies.json
-
-
-cp -r ./../* ./
diff --git a/settings/disable_settings.sh b/settings/disable_settings.sh
new file mode 100755
index 0000000..6ade34a
--- /dev/null
+++ b/settings/disable_settings.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This script will move the settings back to the storage folder, disabling it
+
+mv ../defaults/pref/local-settings.js ./defaults/pref/local-settings.js;
+mv ../distribution/policies.json ./distribution/policies.json;
+mv ../librewolf.cfg ./librewolf.cfg;
+
diff --git a/settings/distribution/policies.json b/settings/distribution/policies.json
new file mode 100644
index 0000000..d705545
--- /dev/null
+++ b/settings/distribution/policies.json
@@ -0,0 +1,21 @@
+{
+  "policies": {
+    "AppUpdateURL": "",
+    "DisableAppUpdate": true,
+    "OverridePostUpdatePage": "",
+
+    "DisableMasterPasswordCreation": true,
+    "DisableFeedbackCommands": true,
+    "DisableFirefoxAccounts": true,
+
+    "DisableFirefoxStudies": true,
+    "DisableTelemetry": true,
+
+    "DisablePocket": true,
+    "DisableProfileImport": true,
+    "DisableSetDesktopBackground": true,
+
+    "DisableSystemAddonUpdate": true,
+    "DisableDeveloperTools": true
+  }
+}
diff --git a/settings/enable_settings.sh b/settings/enable_settings.sh
new file mode 100755
index 0000000..d612ae5
--- /dev/null
+++ b/settings/enable_settings.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp ./defaults/pref/local-settings.js ../defaults/pref/local-settings.js;
+cp ./distribution/policies.json ../distribution/policies.json;
+cp ./librewolf.cfg ../librewolf.cfg;
diff --git a/settings/librewolf.cfg b/settings/librewolf.cfg
index 718a26e..453b5e8 100644
--- a/settings/librewolf.cfg
+++ b/settings/librewolf.cfg
@@ -78,9 +78,6 @@ lockPref("general.config.filename", "librewolf.cfg");
 //
 // ============================================================================================================================================
 
-//to disable dev tools
-// search for devtools.*.enabled in about:config
-
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 // Section : User Settings
 // Bench Diff : +0/5000
@@ -2651,7 +2648,8 @@ lockPref("browser.pagethumbnails.capturing_disabled", true);
 // After other settings, this does not send any data to search.
 
 // Pref : Disable Firefox Account
-lockPref("identity.fxaccounts.enabled", false);
+//lockPref("identity.fxaccounts.enabled", false); //Deprecated Active
+// Already disabled in policies.json
 
 // Pref : 2609: disable MathML (Mathematical Markup Language) (FF51+)
 // [TEST] http://browserspy.dk/mathml.php