aboutsummaryrefslogtreecommitdiff
path: root/manifests/desktop.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/desktop.pp')
-rw-r--r--manifests/desktop.pp42
1 files changed, 4 insertions, 38 deletions
diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index 686801b..39ce4f0 100644
--- a/manifests/desktop.pp
+++ b/manifests/desktop.pp
@@ -1,9 +1,11 @@
class nodo::desktop inherits nodo::physical {
include utils::desktop
+ include pam
+ include xorg
# fstab
file { "/etc/fstab":
- source => "puppet://$desktop/modules/nodo/etc/fstab/desktop",
+ source => "puppet://$server/modules/nodo/etc/fstab/desktop",
owner => "root",
group => "root",
mode => 0644,
@@ -12,7 +14,7 @@ class nodo::desktop inherits nodo::physical {
# crypttab
file { "/etc/crypttab":
- source => "puppet://$desktop/modules/nodo/etc/crypttab/desktop",
+ source => "puppet://$server/modules/nodo/etc/crypttab/desktop",
owner => "root",
group => "root",
mode => 0644,
@@ -24,40 +26,4 @@ class nodo::desktop inherits nodo::physical {
ensure => directory,
mode => 0755,
}
-
- # pam - login
- file { "/etc/pam.d/login":
- source => "puppet://$desktop/modules/nodo/etc/pam.d/login",
- owner => "root",
- group => "root",
- mode => 0644,
- ensure => present,
- }
-
- # pam - gdm
- file { "/etc/pam.d/gdm":
- source => "puppet://$desktop/modules/nodo/etc/pam.d/gdm",
- owner => "root",
- group => "root",
- mode => 0644,
- ensure => present,
- }
-
- # pam - mountpoints
- file { "/etc/security/pam_mount.conf.xml":
- ensure => present,
- owner => root,
- group => root,
- mode => 0644,
- source => "puppet://$server/files/etc/security/pam_mount.conf.xml",
- }
-
- # xorg
- file { "/etc/X11/xorg.conf":
- ensure => present,
- owner => root,
- group => root,
- mode => 0644,
- source => "puppet://$server/files/etc/X11/xorg.conf/$hostname",
- }
}