]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Setting browser default alternative
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Nov 2011 17:12:19 +0000 (15:12 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Nov 2011 17:12:19 +0000 (15:12 -0200)
manifests/subsystems/utils/debian.pp

index a8f2b9ded9c4a0541fc28ae26268dc87ce842802..0d74bebef438f442aa3e6d29ba62915044c888b6 100644 (file)
@@ -65,14 +65,6 @@ class utils::personal::debian {
     ensure => installed,
   }
 
-  # Java alternative
-  file { "/etc/alternatives/java":
-    ensure  => "/usr/lib/jvm/java-6-sun/jre/bin/java",
-    owner   => root,
-    group   => root,
-    require => Package['sun-java6-jre'],
-  }
-
   # Lenny only
   package { [ 'mozilla-firefox-adblock' ]:
     ensure => $lsbdistcodename ? {
@@ -142,4 +134,28 @@ class utils::personal::debian {
     group   => root,
     require => Package['flashplugin-nonfree'],
   }
+
+  # Browser alternative
+  file { "/etc/alternatives/x-www-browser":
+    ensure  => "/usr/bin/iceweasel",
+    owner   => root,
+    group   => root,
+    require => Package['iceweasel'],
+  }
+
+  # Browser alternative: manpage
+  file { "/etc/alternatives/x-www-browser.1.gz":
+    ensure  => "/usr/share/man/man1/iceweasel.1.gz",
+    owner   => root,
+    group   => root,
+    require => Package['iceweasel'],
+  }
+
+  # Java alternative
+  file { "/etc/alternatives/java":
+    ensure  => "/usr/lib/jvm/java-6-sun/jre/bin/java",
+    owner   => root,
+    group   => root,
+    require => Package['sun-java6-jre'],
+  }
 }