extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 00:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from zabbix/master

Browse Source 
Accumulated update
This commit is contained in:
Alexey Pustovalov
2016-10-24 21:13:51 +03:00
committed by GitHub
parent c480154861 443d43f502
commit aec08e4c95
34 changed files with 324 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server-mysql/alpine/Dockerfile
View File

@ -74,6 +74,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
--silent \
--sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-server \
--enable-ipv6 \
# Does not support stable iksemel library
@ -91,8 +92,6 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \
make -j"$(nproc)" -s 1>/dev/null && \
cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
sed -i -e "/^FpingLocation=/s/=.*/=\/usr\/sbin\/fping/" "/etc/zabbix/zabbix_server.conf" && \
sed -i -e "/^Fping6Location=/s/=.*/=\/usr\/sbin\/fping6/" "/etc/zabbix/zabbix_server.conf" && \
chown --quiet -R zabbix:root /etc/zabbix && \
cp database/${DB_TYPE}/schema.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \
cp database/${DB_TYPE}/images.sql /usr/share/doc/zabbix-server-${DB_TYPE}/ && \

20
server-mysql/alpine/run_zabbix_component.sh
View File

@ -609,8 +609,22 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
# Possible few fping locations
if [ -f "/usr/bin/fping" ]; then
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
else
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
fi
if [ -f "/usr/bin/fping6" ]; then
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
else
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
fi
update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################"
echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
#################################################

1
server-mysql/ubuntu/Dockerfile
View File

@ -82,6 +82,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
--silent \
--sysconfdir=/etc/zabbix \
--libdir=/usr/lib/zabbix \
--datadir=/usr/lib \
--enable-server \
--enable-ipv6 \
--with-jabber \

20
server-mysql/ubuntu/run_zabbix_component.sh
View File

@ -609,8 +609,22 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
# Possible few fping locations
if [ -f "/usr/bin/fping" ]; then
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
else
update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
fi
if [ -f "/usr/bin/fping6" ]; then
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
else
update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
fi
update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
@ -888,6 +902,6 @@ clear_deploy "$zbx_type"
echo "########################################################"
echo "** Executing supervisord"
/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
#################################################