summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2018-08-20 18:00:13 -0400
committerJoey Hess2018-08-20 18:00:19 -0400
commit8690c09cc914da6ac3a6ba46ab3ba7690a344cf9 (patch)
tree07923e54f82c7e82f0106764f5ade20e6525ba28 /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent4be2ad75fc22080a11ac3a0988bfc8113345fcaa (diff)
Sudo.enabledFor: Write to /etc/sudoers.d/000users rather than to /etc/sudoers
(Any old lines it wrote to /etc/sudoers will be removed.) This fixes a potential ordering problem; the property used to append the line to /etc/sudoers, but that would override more specific lines in the include directory. By putting it in a file that is included first, it'll come before all includes, without needing to parse the sudoers file in order to put it before the includedir line. Note that, if there is a more specific line for the user in /etc/sudoers before the includedir, it will be overridden by the line in /etc/sudoers.d/000users. But, this is not a behavior change from before, when the line was appended to the end. This commit was sponsored by Jeff Goeke-Smith on Patreon.
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 909ff929..fa7cb064 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -1285,7 +1285,7 @@ autoMountDrive label (USBHubPort port) malias = propertyList desc $ props
& Systemd.enabled automount
& Systemd.started automount
& Sudo.sudoersDFile ("automount-" ++ label)
- [ "%joey ALL= NOPASSWD: " ++ sudocommands
+ [ "joey ALL= NOPASSWD: " ++ sudocommands
]
where
mountpoint = "/media/joey/" ++ label