aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp1
-rw-r--r--manifests/personal.pp2
-rw-r--r--manifests/subsystems/firewall/local.pp9
-rw-r--r--manifests/subsystems/gdm3.pp20
-rw-r--r--manifests/subsystems/utils/laptop.pp2
5 files changed, 29 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 0a3da1c..893f82d 100644
--- 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 5a879f8..b90728f 100644
--- 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 ee82563..7e23e29 100644
--- 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
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 1b4f783..bab727f 100644
--- 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,
}