summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/sudo/manifests/init.pp10
-rw-r--r--modules/sudo/manifests/user.pp7
-rw-r--r--modules/tozt/manifests/other_packages.pp1
-rw-r--r--modules/tozt/manifests/user.pp5
4 files changed, 22 insertions, 1 deletions
diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
new file mode 100644
index 0000000..8a38060
--- /dev/null
+++ b/modules/sudo/manifests/init.pp
@@ -0,0 +1,10 @@
+class sudo {
+ package { "sudo":
+ ensure => 'installed';
+ }
+
+ file { "/etc/sudoers.d/wheel":
+ ensure => present,
+ content => '%wheel ALL=(ALL) ALL';
+ }
+}
diff --git a/modules/sudo/manifests/user.pp b/modules/sudo/manifests/user.pp
new file mode 100644
index 0000000..81fde70
--- /dev/null
+++ b/modules/sudo/manifests/user.pp
@@ -0,0 +1,7 @@
+define sudo::user($user=$name) {
+ include sudo
+
+ file { "/var/db/sudo/lectured/$user":
+ ensure => 'present';
+ }
+}
diff --git a/modules/tozt/manifests/other_packages.pp b/modules/tozt/manifests/other_packages.pp
index 31aa0e4..9bc6169 100644
--- a/modules/tozt/manifests/other_packages.pp
+++ b/modules/tozt/manifests/other_packages.pp
@@ -13,7 +13,6 @@ class tozt::other_packages {
"pkg-config",
"puppet",
"strace",
- "sudo",
"vim",
"zsh",
]:
diff --git a/modules/tozt/manifests/user.pp b/modules/tozt/manifests/user.pp
index 34aff21..022a027 100644
--- a/modules/tozt/manifests/user.pp
+++ b/modules/tozt/manifests/user.pp
@@ -31,6 +31,11 @@ define tozt::user(
conf { $user:
}
+ if $user != 'root' {
+ sudo::user { $user:
+ }
+ }
+
if $shell == '/usr/bin/zsh' {
Package['zsh'] -> User[$user]
}