aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-04-10 10:48:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-04-10 10:48:33 -0300
commit5857c4b1b8b30b89dcff713bb2731799ba10a0c4 (patch)
treee5fc9482c889c3f85aabaf10838ea7167a3d6356
parent279833df056e8bbba7af670b8a2d0aaadcc73f5f (diff)
downloadpuppet-nodo-5857c4b1b8b30b89dcff713bb2731799ba10a0c4.tar.gz
puppet-nodo-5857c4b1b8b30b89dcff713bb2731799ba10a0c4.tar.bz2
Allowing default xorg.conf
-rw-r--r--manifests/subsystems/xorg.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/subsystems/xorg.pp b/manifests/subsystems/xorg.pp
index 60902d1..ff4f5e4 100644
--- a/manifests/subsystems/xorg.pp
+++ b/manifests/subsystems/xorg.pp
@@ -5,6 +5,7 @@ class xorg {
owner => root,
group => root,
mode => 0644,
- source => "puppet://$server/files/etc/X11/xorg.conf/$hostname",
+ source => [ "puppet://$server/files/etc/X11/xorg.conf/$hostname",
+ "puppet://$server/files/etc/X11/xorg.conf.default" ],
}
}