aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-25 19:40:50 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-25 19:40:50 -0300
commit4150f03917bda5d143ef9e00be1922ff48dfbf40 (patch)
treea2c3a3cef0aed5d9490649bac269cd8ed0d14ce0
parent4f52770441da4a8854adb47892225d20426df57d (diff)
parent9cd084f24eb9fd81cdaae86a497b04e9f0469300 (diff)
downloadpuppet-nodo-4150f03917bda5d143ef9e00be1922ff48dfbf40.tar.gz
puppet-nodo-4150f03917bda5d143ef9e00be1922ff48dfbf40.tar.bz2
Merge branch 'master' into develop
-rw-r--r--manifests/subsystem/xorg.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/subsystem/xorg.pp b/manifests/subsystem/xorg.pp
index d6d394c..da8a069 100644
--- a/manifests/subsystem/xorg.pp
+++ b/manifests/subsystem/xorg.pp
@@ -1,7 +1,7 @@
class nodo::subsystem::xorg(
$enable = hiera('nodo::subsystem::xorg::enable', false)
) {
- if $xorg != false {
+ if $enable != false {
file { "/etc/X11/xorg.conf":
ensure => present,
owner => root,