Skip to content

Commit 4c70228

Browse files
committed
cleanup path folders
1 parent 3625c04 commit 4c70228

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rootfs/container/functions/30-zabbix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ EOF
147147
write_config_value "${config_file}" "ZABBIX_PROXY_VAULT_URL" "VaultURL"
148148
write_config_value "${config_file}" "ZABBIX_USER" "User"
149149

150-
echo "Include=${ZABBIX_PROXY_CONFIG_PATH}/${ZABBIX_PROXY_CONFIG_FILE}.d/*.conf" | silent tee -a "${ZABBIX_PROXY_CONFIG_PATH}"/"${ZABBIX_PROXY_CONFIG_FILE}"
150+
echo "Include=${ZABBIX_PROXY_CONFIG_PATH}/${ZABBIX_PROXY_CONFIG_FILE}.d/*.conf" | silent tee -a "${ZABBIX_PROXY_CONFIG_PATH%/}"/"${ZABBIX_PROXY_CONFIG_FILE}"
151151
fi
152152

153153
if var_true "${CONTAINER_ENABLE_MONITORING}" ; then
@@ -272,9 +272,9 @@ echo "Include=${ZABBIX_SERVER_CONFIG_PATH%/}/${ZABBIX_SERVER_CONFIG_FILE}.d/*.co
272272
# Find Companion Zabbix Server Templates at https://github.com/nfrastack/container-zabbix
273273
# Autoregister=zabbixserver
274274
EOF
275-
rm -rf "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}.d"/nginx.conf
276-
rm -rf "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}.d"/php-fpm.conf
277-
rm -rf "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}.d"/nfrastack-php_opcache.conf
275+
rm -rf "${ZABBIX_CONFIG_PATH%/}"/"${ZABBIX_CONFIG_FILE}.d"/nginx.conf
276+
rm -rf "${ZABBIX_CONFIG_PATH%/}"/"${ZABBIX_CONFIG_FILE}.d"/php-fpm.conf
277+
rm -rf "${ZABBIX_CONFIG_PATH%/}"/"${ZABBIX_CONFIG_FILE}.d"/nfrastack-php_opcache.conf
278278
;;
279279
esac
280280
fi

0 commit comments

Comments
 (0)