Merge pull request #669 from robinportigliatti/master

Adding the possibility to put conf file inside the directory /etc/lda…
dalibo · Oct 17, 2024 · 43c2f11 · 43c2f11
2 parents c0d1af5 + a315cdb
commit 43c2f11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -18,6 +18,7 @@ ldap2pg searches for configuration file in the following order :
 1. `ldap2pg.yml` in current working directory.
 2. `~/.config/ldap2pg.yml`.
 3. `/etc/ldap2pg.yml`.
+4. `/etc/ldap2pg/ldap2pg.yml`.
 
 If `LDAP2PG_CONFIG` or `--config` is set,
 ldap2pg skips searching the standard file locations.

diff --git a/internal/config/file.go b/internal/config/file.go
@@ -41,6 +41,8 @@ func FindConfigFile(userValue string) string {
 		path.Join(home, "/.config/ldap2pg.yaml"),
 		"/etc/ldap2pg.yml",
 		"/etc/ldap2pg.yaml",
+		"/etc/ldap2pg/ldap2pg.yml",
+		"/etc/ldap2pg/ldap2pg.yaml",
 	}
 	return FindFile(userValue, candidates)
 }