[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: ldap-createuser-krb5: fix password prompt

[Mike Gabriel (@sunweaver)]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
21457dc8 by Guido Berhoerster at 2023-09-19T11:46:53+02:00
ldap-createuser-krb5: fix password prompt

- - - - -
fddcfc17 by Guido Berhoerster at 2023-09-19T15:15:46+02:00
Disable cfengine3 systemd service

Disabling only cf-execd in 75b4e3f7 (see #1041323) did not work as it gets
pulled in as a dependency of cfengine3. Thus disable the cfengine3 service
instead.

- - - - -


4 changed files:

- Makefile
- cf3/cf.cf-execd → cf3/cf.cfengine3
- cf3/promises.cf
- ldap-tools/ldap-createuser-krb5


Changes:

=====================================
Makefile
=====================================
@@ -52,7 +52,7 @@ wwwdir         = /etc/debian-edu/www
 CF3FILES = \
 	cf.adduser \
 	cf.apache2 \
-	cf.cf-execd \
+	cf.cfengine3 \
 	cf.cups \
 	cf.desktop-networked \
 	cf.dhcpserver \


=====================================
cf3/cf.cf-execd → cf3/cf.cfengine3
=====================================
@@ -1,15 +1,15 @@
-bundle agent cf_execd
+bundle agent cfengine3
 {
-# Disable cf-execd which is enabled by default when systemd is used (#1043353)
+# Disable cfengine3 services which are enabled by default when systemd is used (#1043353)
 
 services:
 
   debian.systemd.(server|ltspserver).installation::
 
-    "cf-execd.service"
+    "cfengine3.service"
       service_policy => "stop";
 
-    "cf-execd.service"
+    "cfengine3.service"
       service_policy => "disable";
 
 }


=====================================
cf3/promises.cf
=====================================
@@ -28,7 +28,7 @@ body common control
 
       bundlesequence => {
                           edu,
-                          cf_execd,
+                          cfengine3,
                           permission_homes,
                           editline_homes,
                           editline_bind,
@@ -76,7 +76,7 @@ body common control
                   "debian-edu/cf.adduser",
                   "debian-edu/cf.apache2",
                   "debian-edu/cf.bind",
-                  "debian-edu/cf.cf-execd",
+                  "debian-edu/cf.cfengine3",
                   "debian-edu/cf.chromium",
                   "debian-edu/cf.cups",
                   "debian-edu/cf.samba",


=====================================
ldap-tools/ldap-createuser-krb5
=====================================
@@ -60,7 +60,8 @@ if [[ $# -ne 2 || -z "$USERNAME" || -z "$GECOS" ]]; then
     exit 1
 fi
 
-read -rs -p "new password: " PASSWORD
+read -rs -p "new user password: " PASSWORD
+echo
 read -rs -p "confirm password: " CONFIRM
 if [[ "${CONFIRM}" != "${PASSWORD}" ]]; then
     echo "passwords do not match" >&2



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/5561b91a51da5b24bc914167604448e9686aa61c...fddcfc173f7bd469f2c625dd9c5fbdb564ebc1a9

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/5561b91a51da5b24bc914167604448e9686aa61c...fddcfc173f7bd469f2c625dd9c5fbdb564ebc1a9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20230919/fe0f073c/attachment-0001.htm>