From ae7250b107f3174183adf88e3bc1dc996961f45b Mon Sep 17 00:00:00 2001
From: Andreas Schiermeier <andreas@schiermeier.name>
Date: Mon, 11 Jul 2016 03:05:40 +0200
Subject: [PATCH] More iceweasel to firefox-esr cleanup tasks.

---
 modules/desktop/files/etc/firefox-esr/{profile => }/prefs.js | 0
 modules/desktop/manifests/init.pp                            | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/desktop/files/etc/firefox-esr/{profile => }/prefs.js (100%)

diff --git a/modules/desktop/files/etc/firefox-esr/profile/prefs.js b/modules/desktop/files/etc/firefox-esr/prefs.js
similarity index 100%
rename from modules/desktop/files/etc/firefox-esr/profile/prefs.js
rename to modules/desktop/files/etc/firefox-esr/prefs.js
diff --git a/modules/desktop/manifests/init.pp b/modules/desktop/manifests/init.pp
index 1bd3fe0..e06d6bf 100644
--- a/modules/desktop/manifests/init.pp
+++ b/modules/desktop/manifests/init.pp
@@ -155,8 +155,8 @@ class desktop {
 		require => File['/etc/skel/Desktop/firefox-esr.desktop'],
 	}
 
-	file { '/etc/firefox-esr/profile/prefs.js':
-		source => 'puppet:///modules/desktop/etc/firefox-esr/profile/prefs.js',
+	file { '/etc/firefox-esr/prefs.js':
+		source => 'puppet:///modules/desktop/etc/firefox-esr/prefs.js',
 		require => [
 			Package['firefox-esr'],
 		],
-- 
GitLab