fix: Remove invalid `mysql` saslauthd mechanism
This commit is contained in:
parent
0ff9c0132a
commit
55469fadab
|
@ -910,22 +910,26 @@ Note: This postgrey setting needs `ENABLE_POSTGREY=1`
|
||||||
|
|
||||||
##### SASLAUTHD_MECHANISMS
|
##### SASLAUTHD_MECHANISMS
|
||||||
|
|
||||||
- **empty** => pam
|
DMS only implements support for these mechanisms:
|
||||||
- `ldap` => authenticate against ldap server
|
|
||||||
- `shadow` => authenticate against local user db
|
- **`ldap`** => Authenticate against an LDAP server
|
||||||
- `mysql` => authenticate against mysql db
|
- `rimap` => Authenticate against an IMAP server
|
||||||
- `rimap` => authenticate against imap server
|
|
||||||
- NOTE: can be a list of mechanisms like pam ldap shadow
|
|
||||||
|
|
||||||
##### SASLAUTHD_MECH_OPTIONS
|
##### SASLAUTHD_MECH_OPTIONS
|
||||||
|
|
||||||
- **empty** => None
|
- **empty** => None
|
||||||
- e.g. with SASLAUTHD_MECHANISMS rimap you need to specify the ip-address/servername of the imap server ==> xxx.xxx.xxx.xxx
|
|
||||||
|
!!! info
|
||||||
|
|
||||||
|
With `SASLAUTHD_MECHANISMS=rimap` you need to specify the ip-address / servername of the IMAP server, such as `SASLAUTHD_MECH_OPTIONS=127.0.0.1`.
|
||||||
|
|
||||||
##### SASLAUTHD_LDAP_SERVER
|
##### SASLAUTHD_LDAP_SERVER
|
||||||
|
|
||||||
- **empty** => same as `LDAP_SERVER_HOST`
|
- **empty** => Use the same value as `LDAP_SERVER_HOST`
|
||||||
- Note: You must include the desired URI scheme (`ldap://`, `ldaps://`, `ldapi://`).
|
|
||||||
|
!!! note
|
||||||
|
|
||||||
|
You must include the desired URI scheme (`ldap://`, `ldaps://`, `ldapi://`).
|
||||||
|
|
||||||
##### SASLAUTHD_LDAP_START_TLS
|
##### SASLAUTHD_LDAP_START_TLS
|
||||||
|
|
||||||
|
|
|
@ -182,8 +182,9 @@ function _environment_variables_ldap() {
|
||||||
function _environment_variables_saslauthd() {
|
function _environment_variables_saslauthd() {
|
||||||
_log 'debug' 'Setting SASLAUTHD-related environment variables now'
|
_log 'debug' 'Setting SASLAUTHD-related environment variables now'
|
||||||
|
|
||||||
# Only used by the supervisor service command (upstream default: `/etc/default/saslauthd`)
|
# This ENV is only used by the supervisor service command:
|
||||||
VARS[SASLAUTHD_MECHANISMS]="${SASLAUTHD_MECHANISMS:=pam}"
|
# NOTE: `pam` is set as the upstream default in `/etc/default/saslauthd`
|
||||||
|
VARS[SASLAUTHD_MECHANISMS]="${SASLAUTHD_MECHANISMS:=ldap}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# This function Writes the contents of the `VARS` map (associative array)
|
# This function Writes the contents of the `VARS` map (associative array)
|
||||||
|
|
|
@ -7,15 +7,6 @@ stderr_logfile=/var/log/supervisor/%(program_name)s.log
|
||||||
command=/usr/sbin/saslauthd -d -a ldap -O /etc/saslauthd.conf
|
command=/usr/sbin/saslauthd -d -a ldap -O /etc/saslauthd.conf
|
||||||
pidfile=/var/run/saslauthd/saslauthd.pid
|
pidfile=/var/run/saslauthd/saslauthd.pid
|
||||||
|
|
||||||
[program:saslauthd_mysql]
|
|
||||||
startsecs=0
|
|
||||||
autostart=false
|
|
||||||
autorestart=true
|
|
||||||
stdout_logfile=/var/log/supervisor/%(program_name)s.log
|
|
||||||
stderr_logfile=/var/log/supervisor/%(program_name)s.log
|
|
||||||
command=/usr/sbin/saslauthd -d -a mysql -O "%(ENV_SASLAUTHD_MECH_OPTIONS)s"
|
|
||||||
pidfile=/var/run/saslauthd/saslauthd.pid
|
|
||||||
|
|
||||||
[program:saslauthd_pam]
|
[program:saslauthd_pam]
|
||||||
startsecs=0
|
startsecs=0
|
||||||
autostart=false
|
autostart=false
|
||||||
|
@ -42,4 +33,3 @@ stdout_logfile=/var/log/supervisor/%(program_name)s.log
|
||||||
stderr_logfile=/var/log/supervisor/%(program_name)s.log
|
stderr_logfile=/var/log/supervisor/%(program_name)s.log
|
||||||
command=/usr/sbin/saslauthd -d -a shadow -O "%(ENV_SASLAUTHD_MECH_OPTIONS)s"
|
command=/usr/sbin/saslauthd -d -a shadow -O "%(ENV_SASLAUTHD_MECH_OPTIONS)s"
|
||||||
pidfile=/var/run/saslauthd/saslauthd.pid
|
pidfile=/var/run/saslauthd/saslauthd.pid
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue