Allow regular users to power off the machine on nodo::base::desktop

diff --git a/files/polkit/org.freedesktop.consolekit.policy b/files/polkit/org.freedesktop.consolekit.policy
index a709b3963b33bbcd3e20d57262dffe920b9571b3..be4b8504baf2a4759bc87084c83d98ff58a8fd73 100644 (file)
--- a/files/polkit/org.freedesktop.consolekit.policy
+++ b/files/polkit/org.freedesktop.consolekit.policy
@@ -14,7 +14,7 @@ Policy definitions for ConsoleKit
     <message>System policy prevents stopping the system</message>
     <defaults>
       <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
+      <!--<allow_active>yes</allow_active>-->
     </defaults>
   </action>
 

diff --git a/manifests/base/desktop.pp b/manifests/base/desktop.pp
index bf9d2fe89847e16a971b1d24ce2df178f1e56e4a..7dd969ce228db4d96eba73d51025f54b8b7bccfb 100644 (file)
--- a/manifests/base/desktop.pp
+++ b/manifests/base/desktop.pp
@@ -4,4 +4,13 @@ class nodo::base::desktop inherits nodo::base::personal {
   class { [ 'nodo::subsystem::fstab', 'nodo::subsystem::crypttab' ]:
     type => 'desktop',
   }
+
+  # Allow regular users to power off the machine (overrides policy kit default configuration)
+  file { '/usr/share/polkit-1/actions/org.freedesktop.consolekit.policy':
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => 0644,
+    source => 'puppet:///modules/nodo/polkit/org.freedesktop.consolekit.policy',
+  }
 }