Skip to content
Snippets Groups Projects
Commit bae544a5 authored by schiermi's avatar schiermi
Browse files

Switched from iceweasel to firefox-esr.

parent 6485b1f7
No related branches found
No related tags found
No related merge requests found
...@@ -34,8 +34,8 @@ class desktop { ...@@ -34,8 +34,8 @@ class desktop {
$packages = [ $packages = [
'pcmanfm', 'pcmanfm',
'iceweasel', 'firefox-esr',
'iceweasel-l10n-*', 'firefox-esr-l10n-*',
'gstreamer1.0-libav', 'gstreamer1.0-libav',
'gstreamer1.0-plugins-good', 'gstreamer1.0-plugins-good',
'flashplugin-nonfree', 'flashplugin-nonfree',
...@@ -140,26 +140,30 @@ class desktop { ...@@ -140,26 +140,30 @@ class desktop {
require => File['/etc/skel/Desktop/pcmanfm.desktop'], require => File['/etc/skel/Desktop/pcmanfm.desktop'],
} }
file { '/etc/skel/Desktop/iceweasel.desktop': file { '/etc/skel/Desktop/firefox-esr.desktop':
source => '/usr/share/applications/iceweasel.desktop', source => '/usr/share/applications/firefox-esr.desktop',
replace => false, replace => false,
require => [ require => [
Package['iceweasel'], Package['firefox-esr'],
File['/etc/skel/Desktop'], File['/etc/skel/Desktop'],
], ],
} }
exec { 'fix-desktop-iceweasel': exec { 'fix-desktop-firefox-esr':
command => '/bin/sed -i "/^Name/ s/=.*/=Webbrowser/;" /etc/skel/Desktop/iceweasel.desktop', command => '/bin/sed -i "/^Name/ s/=.*/=Webbrowser/;" /etc/skel/Desktop/firefox-esr.desktop',
unless => '/bin/grep -q "^Name.*=Webbrowser" /etc/skel/Desktop/iceweasel.desktop', unless => '/bin/grep -q "^Name.*=Webbrowser" /etc/skel/Desktop/firefox-esr.desktop',
require => File['/etc/skel/Desktop/iceweasel.desktop'], require => File['/etc/skel/Desktop/firefox-esr.desktop'],
} }
file { '/etc/firefox-esr/profile':
require => directory,
}
file { '/etc/iceweasel/profile/prefs.js': file { '/etc/firefox-esr/profile/prefs.js':
source => 'puppet:///modules/desktop/etc/iceweasel/profile/prefs.js', source => 'puppet:///modules/desktop/etc/firefox-esr/profile/prefs.js',
require => [ require => [
Package['iceweasel'], Package['firefox-esr'],
File['/etc/firefox-esr/profile'],
], ],
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment