admin/iredmail-iRedMail
1
0
Fork 0
mirror of https://github.com/iredmail/iRedMail synced 2026-06-08 14:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix netdata configuration, switch to Go modules.

Browse Source
This commit is contained in:
Zhang Huangbin
2025-04-10 10:43:01 +08:00
parent 9e64937b7c
commit fb93c1e844
4 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/netdata
+2 -5
View File
@@ -61,11 +61,8 @@ export NETDATA_GO_D_CONF_DIR="${NETDATA_CONF_DIR}/go.d"
export NETDATA_GO_D_CONF_PHPFPM="${NETDATA_GO_D_CONF_DIR}/phpfpm.conf"
export NETDATA_GO_D_CONF_NGINX="${NETDATA_GO_D_CONF_DIR}/nginx.conf"
export NETDATA_GO_D_CONF_MYSQL="${NETDATA_GO_D_CONF_DIR}/mysql.conf"
# Plugin config files.
export NETDATA_PYTHON_D_CONF_DIR="${NETDATA_CONF_DIR}/python.d"
export NETDATA_PYTHON_D_CONF_PGSQL="${NETDATA_PYTHON_D_CONF_DIR}/postgres.conf"
export NETDATA_PYTHON_D_CONF_OPENLDAP="${NETDATA_PYTHON_D_CONF_DIR}/openldap.conf"
export NETDATA_GO_D_CONF_OPENLDAP="${NETDATA_GO_D_CONF_DIR}/openldap.conf"
export NETDATA_GO_D_CONF_PGSQL="${NETDATA_GO_D_CONF_DIR}/postgres.conf"
# Database
# NETDATA_DB_PASSWD is generated in dialog/optional_components.sh.
functions/netdata.sh
+11 -19
View File
@@ -72,12 +72,6 @@ netdata_config()
if [ X"${DISTRO}" == X'FREEBSD' ]; then
perl -pi -e 's#( *memory mode =).*#${1} save#g' ${NETDATA_CONF}
# FreeBSD doesn't have Go plugins, have to use Python plugins instead.
perl -pi -e 's/^(web_log: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
perl -pi -e 's/^(nginx: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
perl -pi -e 's/^(phpfpm: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
perl -pi -e 's/^(mysql: no)/#${1}/' ${NETDATA_PYTHON_D_CONF}
fi
perl -pi -e 's#PH_NETDATA_PORT#$ENV{NETDATA_PORT}#g' ${NETDATA_CONF} >> ${INSTALL_LOG} 2>&1
@@ -101,7 +95,7 @@ netdata_module_config()
{
ECHO_DEBUG "Generate config files for plugins."
mkdir -p ${NETDATA_GO_D_CONF_DIR} ${NETDATA_PYTHON_D_CONF_DIR} &>/dev/null
mkdir -p ${NETDATA_GO_D_CONF_DIR} &>/dev/null
# go.d modules: phpfpm, nginx.
cp -f ${SAMPLE_DIR}/netdata/go.d/phpfpm.conf ${NETDATA_GO_D_CONF_PHPFPM} >> ${INSTALL_LOG} 2>&1
@@ -111,9 +105,9 @@ netdata_module_config()
if [ X"${BACKEND}" == X'OPENLDAP' ]; then
ECHO_DEBUG "Generate ${NETDATA_PYTHON_D_CONF_OPENLDAP}."
cp -f ${SAMPLE_DIR}/netdata/python.d/openldap.conf ${NETDATA_PYTHON_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_LDAP_BINDDN#$ENV{LDAP_BINDDN}#g' ${NETDATA_PYTHON_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_LDAP_BINDPW#$ENV{LDAP_BINDPW}#g' ${NETDATA_PYTHON_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
cp -f ${SAMPLE_DIR}/netdata/go.d/openldap.conf ${NETDATA_GO_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_LDAP_BINDDN#$ENV{LDAP_BINDDN}#g' ${NETDATA_GO_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_LDAP_BINDPW#$ENV{LDAP_BINDPW}#g' ${NETDATA_GO_D_CONF_OPENLDAP} >> ${INSTALL_LOG} 2>&1
fi
# MySQL & PostgreSQL
@@ -147,19 +141,18 @@ EOF
CREATE USER ${NETDATA_DB_USER} WITH ENCRYPTED PASSWORD '${NETDATA_DB_PASSWD}' NOSUPERUSER NOCREATEDB NOCREATEROLE;
EOF
ECHO_DEBUG "Generate ${NETDATA_PYTHON_D_CONF_PGSQL}."
backup_file ${NETDATA_PYTHON_D_CONF_PGSQL}
cp -f ${SAMPLE_DIR}/netdata/python.d/postgres.conf ${NETDATA_PYTHON_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_NETDATA_DB_USER#$ENV{NETDATA_DB_USER}#g' ${NETDATA_PYTHON_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_NETDATA_DB_PASSWD#$ENV{NETDATA_DB_PASSWD}#g' ${NETDATA_PYTHON_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
ECHO_DEBUG "Generate ${NETDATA_GO_D_CONF_PGSQL}."
backup_file ${NETDATA_GO_D_CONF_PGSQL}
cp -f ${SAMPLE_DIR}/netdata/go.d/postgres.conf ${NETDATA_GO_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_NETDATA_DB_USER#$ENV{NETDATA_DB_USER}#g' ${NETDATA_GO_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
perl -pi -e 's#PH_NETDATA_DB_PASSWD#$ENV{NETDATA_DB_PASSWD}#g' ${NETDATA_GO_D_CONF_PGSQL} >> ${INSTALL_LOG} 2>&1
fi
write_iredmail_kv "sql_user_${NETDATA_DB_USER}" "${NETDATA_DB_PASSWD}"
chown -R ${SYS_USER_NETDATA}:${SYS_GROUP_NETDATA} ${NETDATA_GO_D_CONF_DIR} ${NETDATA_PYTHON_D_CONF_DIR}
chmod 0755 ${NETDATA_GO_D_CONF_DIR} ${NETDATA_PYTHON_D_CONF_DIR}
chown -R ${SYS_USER_NETDATA}:${SYS_GROUP_NETDATA} ${NETDATA_GO_D_CONF_DIR}
chmod 0755 ${NETDATA_GO_D_CONF_DIR}
chmod 0400 ${NETDATA_GO_D_CONF_DIR}/*.conf &>/dev/null
chmod 0400 ${NETDATA_PYTHON_D_CONF_DIR}/*.conf &>/dev/null
echo 'export status_netdata_module_config="DONE"' >> ${STATUS_FILE}
}
@@ -201,7 +194,6 @@ netdata (monitor):
- Main config file: ${NETDATA_CONF}
- Modified modular config files:
- ${NETDATA_GO_D_CONF_DIR}
- ${NETDATA_PYTHON_D_CONF_DIR}
- HTTP auth file (if you need a new account to access netdata, please
update this file with command like 'htpasswd' or edit manually):
- ${NETDATA_HTTPD_AUTH_FILE}
samples/netdata/go.d/openldap.conf
-2
View File
@@ -1,5 +1,3 @@
{{ ansible_managed | comment }}
jobs:
- name: local
url: ldap://127.0.0.1:389
samples/nginx/templates/netdata.tmpl
+3 -2
View File
@@ -1,8 +1,9 @@
# Running netdata as a subfolder to an existing virtual host
# FYI: https://github.com/firehol/netdata/wiki/Running-behind-nginx
location = /netdata {
return 301 /netdata/;
# Skip the splash and cloud login screen.
location ~* /netdata/*$ {
return 301 /netdata/v3;
}
location ~ /netdata/(?<ndpath>.*) {