From 57ce323cabf620440f72716f1279a95a073512f7 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 7 Mar 2020 20:16:03 +0100
Subject: [PATCH] [conf] Update nslcd and nsswitch stuff using new Buster's
 default configs + get rid of nslcd service, only keep the regen-conf part

---
 data/templates/nslcd/nslcd.conf       | 12 ++++++++++++
 data/templates/nsswitch/nsswitch.conf | 10 +++-------
 data/templates/yunohost/services.yml  |  9 +++++----
 locales/en.json                       |  3 +--
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/data/templates/nslcd/nslcd.conf b/data/templates/nslcd/nslcd.conf
index 091ecb7cc..7cfe73e07 100644
--- a/data/templates/nslcd/nslcd.conf
+++ b/data/templates/nslcd/nslcd.conf
@@ -15,6 +15,18 @@ base dc=yunohost,dc=org
 # The LDAP protocol version to use.
 #ldap_version 3
 
+# The DN to bind with for normal lookups.
+#binddn cn=annonymous,dc=example,dc=net
+#bindpw secret
+
+# The DN used for password modifications by root.
+#rootpwmoddn cn=admin,dc=example,dc=com
+
+# SSL options
+#ssl off
+#tls_reqcert never
+tls_cacertfile /etc/ssl/certs/ca-certificates.crt
+
 # The search scope.
 #scope sub
 
diff --git a/data/templates/nsswitch/nsswitch.conf b/data/templates/nsswitch/nsswitch.conf
index b55e01b02..8f46e4f5d 100644
--- a/data/templates/nsswitch/nsswitch.conf
+++ b/data/templates/nsswitch/nsswitch.conf
@@ -1,12 +1,8 @@
 # /etc/nsswitch.conf
-#
-# Example configuration of GNU Name Service Switch functionality.
-# If you have the `glibc-doc-reference' and `info' packages installed, try:
-# `info libc "Name Service Switch"' for information about this file.
 
-passwd:         compat ldap
-group:          compat ldap
-shadow:         compat ldap
+passwd:         files systemd ldap
+group:          files systemd ldap
+shadow:         files ldap
 gshadow:        files
 
 hosts:          files myhostname mdns4_minimal [NOTFOUND=return] dns
diff --git a/data/templates/yunohost/services.yml b/data/templates/yunohost/services.yml
index e1dd57e55..73ae9403e 100644
--- a/data/templates/yunohost/services.yml
+++ b/data/templates/yunohost/services.yml
@@ -20,10 +20,9 @@ nginx:
   test_conf: nginx -t
   needs_exposed_ports: [80, 443]
   category: web
-nslcd: {}
-php7.0-fpm:
-  log: /var/log/php7.0-fpm.log
-  test_conf: php-fpm7.0 --test
+php7.3-fpm:
+  log: /var/log/php7.3-fpm.log
+  test_conf: php-fpm7.3 --test
   category: web
 postfix:
   log: [/var/log/mail.log,/var/log/mail.err]
@@ -64,3 +63,5 @@ postgrey: null
 spamassassin: null
 rmilter: null
 php5-fpm: null
+php7.0-fpm: null
+nslcd: null
diff --git a/locales/en.json b/locales/en.json
index 3f17b576a..f3daed3ca 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -534,8 +534,7 @@
     "service_description_metronome": "Manage XMPP instant messaging accounts",
     "service_description_mysql": "Stores app data (SQL database)",
     "service_description_nginx": "Serves or provides access to all the websites hosted on your server",
-    "service_description_nslcd": "Handles YunoHost user shell connection",
-    "service_description_php7.0-fpm": "Runs apps written in PHP with NGINX",
+    "service_description_php7.3-fpm": "Runs apps written in PHP with NGINX",
     "service_description_postfix": "Used to send and receive e-mails",
     "service_description_redis-server": "A specialized database used for rapid data access, task queue, and communication between programs",
     "service_description_rspamd": "Filters spam, and other e-mail related features",