X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=local%2Fuser-configure;h=85b6cb0c550ed07601f56285899b6e40a5f10db4;hp=fc825f73788ea1a377b3e5e5a37ce4d3129d12b0;hb=82a43a9c95892ecfa8bad1a72b490ad0bf60cd3b;hpb=0d705d8e2a919ee40866307aa3e18b1a5c4e7583

diff --git a/local/user-configure b/local/user-configure
index fc825f7..85b6cb0 100755
--- a/local/user-configure
+++ b/local/user-configure
@@ -1,5 +1,4 @@
 #!/bin/sh -eu
-# SYNTAX: $user
 tool=$(readlink -e "${0%/*}/..")
 . "$tool"/local/lib.sh
 
@@ -20,26 +19,19 @@ sudo install -d -m 770 -o root -g root \
  /etc/skel/var/run/ssh
 sudo ln -fns etc/ssh /etc/skel/.ssh
 sudo ln -fns etc/gpg /etc/skel/.gnupg
-sudo install -m 640 -o root -g root /dev/stdin \
- /etc/sudoers.d/passwd-init <<-EOF
-	%sudo ALL=(ALL) NOPASSWD: /bin/sh -e -f -u -c \\
-	  case \$(/usr/bin/passwd --status "\$SUDO_USER") in \\
-	    ("\$SUDO_USER L "*) /usr/bin/passwd \$SUDO_USER;; esac
-	EOF
-sudo install -m 640 -o root -g root /dev/stdin \
- /etc/sudoers.d/etckeeper-unclean <<-EOF
-	%sudo ALL=(ALL) NOPASSWD: /usr/bin/etckeeper unclean
-	EOF
-sudo install -m 640 -o root -g root /dev/stdin \
- /etc/sudoers.d/env_keep <<-EOF
-	Defaults env_keep = " \\
-	  EDITOR \\
-	  GIT_AUTHOR_NAME \\
-	  GIT_AUTHOR_EMAIL \\
-	  GIT_COMMITTER_NAME \\
-	  GIT_COMMITTER_EMAIL \\
-	 "
-	EOF
+sudo find "$tool"/etc/sudoers.d \
+ -mindepth 1 -maxdepth 1 -type f -exec \
+ install -m 640 -o root -g root \
+ -t /etc/sudoers.d {} +
+sudo install -m 640 -o root -g root \
+ "$tool"/etc/sudoers.d/passwd-init \
+        /etc/sudoers.d/passwd-init
+sudo install -m 640 -o root -g root \
+ "$tool"/etc/sudoers.d/etckeeper-unclean \
+        /etc/sudoers.d/etckeeper-unclean
+sudo install -m 640 -o root -g root \
+ "$tool"/etc/sudoers.d/env_keep \
+        /etc/sudoers.d/env_keep
 sudo install -m 755 -o root -g root \
   "$tool"/local/passwd-init \
  /usr/local/bin/passwd-init