Fixed small issues. Preparation for Appliance

This commit is contained in:
root
2018-03-30 06:15:14 -07:00
parent 7c7635c388
commit f4aa02c0b9
36 changed files with 300 additions and 147 deletions

View File

@ -107,12 +107,16 @@ prepare_system() {
ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
[ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
[ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
[ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
}

View File

@ -107,12 +107,16 @@ prepare_system() {
ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
[ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
[ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
[ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
}

View File

@ -107,12 +107,16 @@ prepare_system() {
ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
[ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
[ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
[ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
}