diff --git a/net-nds/kanidm/files/kanidm-unixd-tasks.initd b/net-nds/kanidm/files/kanidm-unixd-tasks.initd index e8b55c6..0bcefd2 100755 --- a/net-nds/kanidm/files/kanidm-unixd-tasks.initd +++ b/net-nds/kanidm/files/kanidm-unixd-tasks.initd @@ -8,21 +8,12 @@ depend() { after kanidm-unixd } -: ${KANIDM_CONF:=/etc/kanidm/unix} -: ${KANIDM_USER:=kanidm} -: ${KANIDM_GROUP:=kanidm} -: ${KANIDM_WORK_DIR:=/var/lib/kanidm} -: ${KANIDM_CUSTOM:=${KANIDM_WORK_DIR}/custom} - capabilities="CAP_CHOWN CAP_FOWNER CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH" command="/usr/bin/kanidm_unixd_tasks" -#command_args="--config-path ${KANIDM_CONF} server" command_background="true" -command_user="${KANIDM_USER}:${KANIDM_GROUP}" error_log="/var/log/kanidm/${RC_SVCNAME}.err" output_log="/var/log/kanidm/${RC_SVCNAME}.log" pidfile="/run/${RC_SVCNAME}.pid" -#required_files="${KANIDM_CONF}" start_pre() { checkpath -m0750 -o "${KANIDM_USER:-root}:${KANIDM_GROUP:-root}" -d /run/${RC_SVCNAME} diff --git a/net-nds/kanidm/files/kanidm-unixd.initd b/net-nds/kanidm/files/kanidm-unixd.initd index d310701..842a56f 100755 --- a/net-nds/kanidm/files/kanidm-unixd.initd +++ b/net-nds/kanidm/files/kanidm-unixd.initd @@ -9,20 +9,17 @@ depend() { after ntpd } -: ${KANIDM_CONF:=/etc/kanidm/unix} +: ${KANIDM_UNIX_CONFIG:=/etc/kanidm/unixd} +: ${KANIDM_CLIENT_CONFIG:=/etc/kanidm/config} : ${KANIDM_USER:=kanidm} : ${KANIDM_GROUP:=kanidm} -: ${KANIDM_WORK_DIR:=/var/lib/kanidm-unixd} -: ${KANIDM_CUSTOM:=${KANIDM_WORK_DIR}/custom} command="/usr/bin/kanidm_unixd" -#command_args="--config-path ${KANIDM_CONF} server" command_background="true" command_user="${KANIDM_USER}:${KANIDM_GROUP}" error_log="/var/log/kanidm/${RC_SVCNAME}.err" output_log="/var/log/kanidm/${RC_SVCNAME}.log" pidfile="/run/${RC_SVCNAME}.pid" -#required_files="${KANIDM_CONF}" start_pre() { checkpath -m0750 -o "${KANIDM_USER:-root}:${KANIDM_GROUP:-root}" -d /run/${RC_SVCNAME} -d /var/cache/${RC_SVCNAME} -d /var/lib/${RC_SVCNAME}