From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 10 Apr 2010 13:48:33 +0000 (-0300)
Subject: Allowing default xorg.conf
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=5857c4b1b8b30b89dcff713bb2731799ba10a0c4;p=puppet-nodo.git

Allowing default xorg.conf
---

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" ],
   }
 }