From 3b3fec12b68aeac789dc2b03fb228b85a3e36d2d Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sat, 11 Dec 2021 19:42:06 +0200
Subject: [PATCH] Pre-commit fixups.
---
.pre-commit-config.yaml | 1 +
ldap-account-manager/README.md | 2 +-
ldap-account-manager/lam-setpass | 1 -
nss-pam-ldapd/README.md | 2 +-
slapd/README.md | 4 ++--
slapd/config.ldif | 1 -
slapd/entrypoint | 2 +-
7 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6fe5892..1cf5d49 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,6 +19,7 @@ repos:
rev: v2.1.0
hooks:
- id: codespell
+ exclude: diff
- repo: https://github.com/Yelp/detect-secrets.git
rev: v1.1.0
diff --git a/ldap-account-manager/README.md b/ldap-account-manager/README.md
index 292e4ce..dbc2480 100644
--- a/ldap-account-manager/README.md
+++ b/ldap-account-manager/README.md
@@ -5,7 +5,7 @@
## Environment variables
Name | Description | Default value
-\-\-\- | \-\-\- | \-\-\-
+--- | --- | ---
`LAM_PASSWORD` | Password for administering LAM | `lam`
`LDAP_URI` | URI of the LDAP service | `ldapi:///`
`LDAP_ADMIN_DN` | DN of the admin account
diff --git a/ldap-account-manager/lam-setpass b/ldap-account-manager/lam-setpass
index 51df3cd..4e482f4 100755
--- a/ldap-account-manager/lam-setpass
+++ b/ldap-account-manager/lam-setpass
@@ -12,4 +12,3 @@ $cfg->save();
$conf = new LAMConfig("lam");
$conf->set_Passwd($argv[1]);
$conf->save();
-
diff --git a/nss-pam-ldapd/README.md b/nss-pam-ldapd/README.md
index de9bbe3..d39bcbf 100644
--- a/nss-pam-ldapd/README.md
+++ b/nss-pam-ldapd/README.md
@@ -11,7 +11,7 @@ daemon. To use this container, execute a different process (like `su` or
## Environment variables
Name | Default value
-\-\-\- | \-\-\-
+--- | ---
`LDAP_URIS` | `ldapi:///`
`LDAP_AUTH_TYPE` | `none`
`LDAP_BINDDN`
diff --git a/slapd/README.md b/slapd/README.md
index 98c650f..63795a8 100644
--- a/slapd/README.md
+++ b/slapd/README.md
@@ -10,7 +10,7 @@ The container exposes TCP ports 389 (LDAP) and 636 (LDAPS) as well as the
## Environment variables
Name | Description | Default value
-\-\-\- | \-\-\- | \-\-\-
+--- | --- | ---
`LDAP_URLS` | List of URLs to serve. | `ldap:/// ldapi:/// ldaps:///`
`LDAP_ROOTPASS` | Root password.
`LDAP_DOMAIN` | Domain.
@@ -30,7 +30,7 @@ provided, those are used instead.
## Persistence
The configuration (`cn=config`) and data LDAP directories reside in the
-`config` and `data` diretories respectively in the `/var/lib/ldap` volume.
+`config` and `data` directories respectively in the `/var/lib/ldap` volume.
The LDAP directories are generated only if they're missing. Changes to
environment variables afterwards won't change the configuration, since that is
persisted to a volume. There's also the `/var/backups/ldap` volume where the
diff --git a/slapd/config.ldif b/slapd/config.ldif
index e10040d..48c1e73 100644
--- a/slapd/config.ldif
+++ b/slapd/config.ldif
@@ -109,4 +109,3 @@ olcAccess: to attrs=shadowLastChange
# everyone else can read everything.
olcAccess: to *
by * read
-
diff --git a/slapd/entrypoint b/slapd/entrypoint
index 95c232b..9a0d41f 100755
--- a/slapd/entrypoint
+++ b/slapd/entrypoint
@@ -7,7 +7,7 @@ unset LDAP_ROOTPASS
export PASSWORD_HASH
# See https://github.com/moby/moby/issues/8231
-# shellcheck disable=SC2039
+# shellcheck disable=SC3045
ulimit -n 1024 || true
# Base DN.
--
GitLab