diff --git a/build-images.sh b/build-images.sh index dd2b627..8f512bc 100644 --- a/build-images.sh +++ b/build-images.sh @@ -76,8 +76,7 @@ buildah config \ --env=LDAP_ADMPASS="secret" \ --env=LDAP_DOMAIN="nethserver.test" \ --env=LDAP_SUFFIX="dc=nethserver,dc=test" \ - --env=LDAP_LOGTAG="slapd" \ - --env=LDAP_LOGLEVEL="16704" \ + --env=LDAP_LOGLEVEL="16384" \ --env=LDAP_DEBUGLEVEL="0" \ "${container}" # Commit the image diff --git a/imageroot/actions/configure-module/50start_provisioning b/imageroot/actions/configure-module/50start_provisioning index eda4dec..c072e1e 100755 --- a/imageroot/actions/configure-module/50start_provisioning +++ b/imageroot/actions/configure-module/50start_provisioning @@ -80,7 +80,6 @@ ldapenv = { 'LDAP_SERVERID': str(server_id), 'LDAP_PORT': os.environ['TCP_PORT'], 'LDAP_IPADDR': ip_address, - 'LDAP_LOGTAG': os.environ['MODULE_ID'], } for lvar in ldapenv: @@ -92,4 +91,3 @@ os.environ.update({ 'LDAP_ADMPASS': request['admpass'], }) agent.run_helper(*podman_cmd).check_returncode() -agent.dump_env() # Persist environment file for Systemd unit diff --git a/imageroot/actions/import-module/50import_environment b/imageroot/actions/import-module/50import_environment index 38db461..1396582 100755 --- a/imageroot/actions/import-module/50import_environment +++ b/imageroot/actions/import-module/50import_environment @@ -31,10 +31,7 @@ ldapenv = { 'LDAP_SERVERID': str(server_id), 'LDAP_PORT': os.environ['TCP_PORT'], 'LDAP_IPADDR': ip_address, - 'LDAP_LOGTAG': os.environ['MODULE_ID'], } for lvar in ldapenv: agent.set_env(lvar, ldapenv[lvar]) - -agent.dump_env() diff --git a/imageroot/actions/restore-module/10resume_environment b/imageroot/actions/restore-module/10resume_environment index 47585df..99c5127 100755 --- a/imageroot/actions/restore-module/10resume_environment +++ b/imageroot/actions/restore-module/10resume_environment @@ -34,10 +34,7 @@ ldapenv = { 'LDAP_SERVERID': str(server_id), 'LDAP_PORT': os.environ['TCP_PORT'], 'LDAP_IPADDR': ip_address, - 'LDAP_LOGTAG': os.environ['MODULE_ID'], } for lvar in ldapenv: agent.set_env(lvar, ldapenv[lvar]) - -agent.dump_env() diff --git a/server/README.md b/server/README.md index e0d5ad3..2e67f52 100644 --- a/server/README.md +++ b/server/README.md @@ -20,7 +20,6 @@ The LDAP database schema should be compliant with RFC2307. always added to this too) * `LDAP_SERVERID`, a unique positive integer required to identify the server among others of the same domain -* `LDAP_LOGTAG`, server Syslog identifier * `LDAP_DEBUGLEVEL`, slapd debug-level (see `slapd` manpage for info). * `LDAP_LOGLEVEL`, slapd log level (see `slapd` manpage for info). Used to set log file verbosity, for debug purposes. @@ -96,7 +95,6 @@ Create a `./lenv` file with the following contents LDAP_SERVERID=1 LDAP_PORT=10389 LDAP_IPADDR=10.5.4.1 - LDAP_LOGTAG=domtest1 Provision the domain diff --git a/server/entrypoint.sh b/server/entrypoint.sh index 0b64c26..2bdf380 100755 --- a/server/entrypoint.sh +++ b/server/entrypoint.sh @@ -31,7 +31,6 @@ LDAP_SUFFIX=${LDAP_SUFFIX:?} LDAP_DOMAIN=${LDAP_DOMAIN:?} LDAP_IPADDR=${LDAP_IPADDR:?} LDAP_PORT=${LDAP_PORT:?} -LDAP_LOGTAG=${LDAP_LOGTAG:?} LDAP_DEBUGLEVEL=${LDAP_DEBUGLEVEL:?} LDAP_LOGLEVEL=${LDAP_LOGLEVEL:?} @@ -52,7 +51,7 @@ mkdir -p run if [ $# -eq 0 ]; then rm -vf run/* - exec slapd -n "${LDAP_LOGTAG}" -d "${LDAP_DEBUGLEVEL}" -F conf.d -h "${tmpl_server_url} ldap://127.0.0.1:${LDAP_PORT} ldapi://" + exec slapd -d "${LDAP_DEBUGLEVEL}" -F conf.d -h "${tmpl_server_url} ldap://127.0.0.1:${LDAP_PORT} ldapi://" else exec "${@}" fi