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

Added ZBX_SESSION_NAME for Zabbix frontend

Browse Source
This commit is contained in:
root 2019-01-14 00:44:13 +02:00
parent c8421dd575
commit 55eb398387
34 changed files with 204 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
agent/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
agent/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
agent/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
java-gateway/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
java-gateway/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
server-mysql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
server-mysql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
server-pgsql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
zabbix-appliance/alpine/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
zabbix-appliance/centos/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -814,13 +814,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -878,6 +879,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {

9
zabbix-appliance/ubuntu/docker-entrypoint.sh
View File

@ -826,13 +826,14 @@ prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" echo "** Preparing Zabbix frontend configuration file"
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php" ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then if [ -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php" ]; then
rm -f "/usr/share/zabbix/conf/zabbix.conf.php" rm -f "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
fi fi
ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php" ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
# Different places of PHP configuration file # Different places of PHP configuration file
if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
@ -890,6 +891,8 @@ prepare_zbx_web_config() {
"$ZBX_WEB_CONFIG" "$ZBX_WEB_CONFIG"
[ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG" [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
sed "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
} }
prepare_zbx_agent_config() { prepare_zbx_agent_config() {