Switched from iceweasel to firefox-esr.
authorAndreas Schiermeier <andreas@schiermeier.name>
Mon, 11 Jul 2016 01:00:19 +0000 (03:00 +0200)
committerAndreas Schiermeier <andreas@schiermeier.name>
Mon, 11 Jul 2016 01:00:19 +0000 (03:00 +0200)
modules/desktop/files/etc/firefox-esr/profile/prefs.js [new file with mode: 0644]
modules/desktop/files/etc/iceweasel/profile/prefs.js [deleted file]
modules/desktop/manifests/init.pp

diff --git a/modules/desktop/files/etc/firefox-esr/profile/prefs.js b/modules/desktop/files/etc/firefox-esr/profile/prefs.js
new file mode 100644 (file)
index 0000000..4726435
--- /dev/null
@@ -0,0 +1,20 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+# Mozilla User Preferences
+
+/* Do not edit this file.
+ *
+ * If you make changes to this file while the browser is running,
+ * the changes will be overwritten when the browser exits.
+ *
+ * To make a manual change to preferences, you can visit the URL about:config
+ */
+user_pref("browser.cache.disk.capacity", 1024);
+user_pref("browser.cache.disk.smart_size.enabled", false);
+user_pref("browser.cache.disk.smart_size.first_run", false);
+user_pref("browser.cache.disk.smart_size.use_old_max", false);
+user_pref("browser.download.useDownloadDir", false);
+user_pref("browser.startup.homepage", "http://ccc-ffm.de/getting-started/");
+user_pref("privacy.donottrackheader.enabled", true);
diff --git a/modules/desktop/files/etc/iceweasel/profile/prefs.js b/modules/desktop/files/etc/iceweasel/profile/prefs.js
deleted file mode 100644 (file)
index 4726435..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the browser is running,
- * the changes will be overwritten when the browser exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- */
-user_pref("browser.cache.disk.capacity", 1024);
-user_pref("browser.cache.disk.smart_size.enabled", false);
-user_pref("browser.cache.disk.smart_size.first_run", false);
-user_pref("browser.cache.disk.smart_size.use_old_max", false);
-user_pref("browser.download.useDownloadDir", false);
-user_pref("browser.startup.homepage", "http://ccc-ffm.de/getting-started/");
-user_pref("privacy.donottrackheader.enabled", true);
index 81a7813..e8bc33d 100644 (file)
@@ -34,8 +34,8 @@ class desktop {
 
        $packages = [
                'pcmanfm',
-               'iceweasel',
-               'iceweasel-l10n-*',
+               'firefox-esr',
+               'firefox-esr-l10n-*',
                'gstreamer1.0-libav',
                'gstreamer1.0-plugins-good',
                'flashplugin-nonfree',
@@ -140,26 +140,30 @@ class desktop {
                require => File['/etc/skel/Desktop/pcmanfm.desktop'],
        }
 
-       file { '/etc/skel/Desktop/iceweasel.desktop':
-               source => '/usr/share/applications/iceweasel.desktop',
+       file { '/etc/skel/Desktop/firefox-esr.desktop':
+               source => '/usr/share/applications/firefox-esr.desktop',
                replace => false,
                require => [
-                       Package['iceweasel'],
+                       Package['firefox-esr'],
                        File['/etc/skel/Desktop'],
                ],
        }
 
-       exec { 'fix-desktop-iceweasel':
-               command => '/bin/sed -i "/^Name/ s/=.*/=Webbrowser/;" /etc/skel/Desktop/iceweasel.desktop',
-               unless => '/bin/grep -q "^Name.*=Webbrowser" /etc/skel/Desktop/iceweasel.desktop',
-               require => File['/etc/skel/Desktop/iceweasel.desktop'],
+       exec { 'fix-desktop-firefox-esr':
+               command => '/bin/sed -i "/^Name/ s/=.*/=Webbrowser/;" /etc/skel/Desktop/firefox-esr.desktop',
+               unless => '/bin/grep -q "^Name.*=Webbrowser" /etc/skel/Desktop/firefox-esr.desktop',
+               require => File['/etc/skel/Desktop/firefox-esr.desktop'],
        }
 
+       file { '/etc/firefox-esr/profile':
+               require => directory,
+       }
 
-       file { '/etc/iceweasel/profile/prefs.js':
-               source => 'puppet:///modules/desktop/etc/iceweasel/profile/prefs.js',
+       file { '/etc/firefox-esr/profile/prefs.js':
+               source => 'puppet:///modules/desktop/etc/firefox-esr/profile/prefs.js',
                require => [
-                       Package['iceweasel'],
+                       Package['firefox-esr'],
+                       File['/etc/firefox-esr/profile'],
                ],
        }