Adding gdm3 class and misc fixes

diff --git a/manifests/init.pp b/manifests/init.pp
index 0a3da1c010a2b0698b3113846946b2fa874a15d8..893f82d34240a87f35c45d4856b90d2a441ab6af 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -79,6 +79,7 @@ import "subsystems/munin.pp"
 import "subsystems/pam.pp"
 import "subsystems/xorg.pp"
 import "subsystems/gdm.pp"
+import "subsystems/gdm3.pp"
 import "subsystems/modprobe.pp"
 import "subsystems/hosts.pp"
 import "subsystems/locales.pp"

diff --git a/manifests/personal.pp b/manifests/personal.pp
index 5a879f86d9ebea6b90a6ff3d7136ef5c95f8db11..b90728f28b357ec8f65773c87ed604835ce60825 100644 (file)
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -8,6 +8,8 @@ class nodo::personal {
 
   if $::lsbdistcodename == 'squeeze' {
     include gdm
+  else
+    include gdm3
   }
 
   # Monitoring

diff --git a/manifests/subsystems/firewall/local.pp b/manifests/subsystems/firewall/local.pp
index ee82563d3464560932f6c4846023a992320e0121..7e23e290a7eda64fc5f2d5f9653775296a6d15fd 100644 (file)
--- a/manifests/subsystems/firewall/local.pp
+++ b/manifests/subsystems/firewall/local.pp
@@ -5,6 +5,11 @@ class firewall::local(
   $manage_interface = hiera('nodo::firewall::local::manage_iface', false)
 ) {
 
+  shorewall::zone { 'loc':
+    type  => 'ipv4',
+    order => 4,
+  }
+
   if $manage_host {
     shorewall::host { "$interface-loc":
       name    => "$interface:$network",
@@ -44,8 +49,4 @@ class firewall::local(
     order           => 7,
   }
 
-  shorewall::zone { 'loc':
-    type  => 'ipv4',
-    order => 4,
-  }
 }

diff --git a/manifests/subsystems/gdm3.pp b/manifests/subsystems/gdm3.pp
new file mode 100644 (file)
index 0000000..0dfda11
--- /dev/null
+++ b/manifests/subsystems/gdm3.pp
@@ -0,0 +1,20 @@
+class gdm3 {
+  package { 'gdm3':
+    ensure => installed,
+  }
+
+  service { 'gdm3':
+    ensure  => running,
+    require => Package['gdm3'],
+  }
+
+  file { '/etc/gdm3/greeter.gsettings':
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    notify => Service['gdm3'],
+    source => [ "puppet:///modules/site_nodo/etc/gdm3/${::domain}/greeter.gseetings",
+                "puppet:///modules/nodo/etc/gdm3/greeter.gsettings", ]
+  }
+}

diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp
index 1b4f78335420f36413c9f578d874de458f61e1e9..bab727fbd2c4626848707cef1f884d50d4b88637 100644 (file)
--- a/manifests/subsystems/utils/laptop.pp
+++ b/manifests/subsystems/utils/laptop.pp
@@ -22,7 +22,7 @@ class utils::laptop::debian {
   }
 
   # Wicd
-  package { 'wicd', 'wicd-curses':
+  package { [ 'wicd', 'wicd-curses' ]:
     ensure => installed,
   }