diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index 463218fbf..d8dab5d47 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -60,10 +60,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -211,10 +207,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -271,25 +263,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Apache) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index 9fc0b7da8..a95e092e8 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -60,10 +60,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -211,10 +207,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -271,24 +263,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - ################################################# echo "** Deploying Zabbix web-interface (Apache) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index 11c44c61e..c9f21c9c6 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -60,10 +60,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -207,10 +203,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -264,25 +256,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Apache) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index e8c2c8ccd..547944719 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -257,25 +257,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Apache) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index 0e678ebda..e736dfc17 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -60,10 +60,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -269,24 +265,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - ################################################# echo "** Deploying Zabbix web-interface (Apache) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 15a1fe859..c8342e7be 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -60,10 +60,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -266,25 +262,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Apache) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index a61a6d6ed..9b47c9a27 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -62,10 +62,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -231,10 +227,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -292,25 +284,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Nginx) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index 35a91bfbf..9d2b02c2b 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -62,10 +62,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -231,10 +227,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -292,25 +284,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Nginx) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 04296446c..7a67e880b 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -62,10 +62,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -227,10 +223,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -284,25 +276,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Nginx) with MySQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index 3b127c1af..15acb4cd7 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -62,10 +62,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -227,10 +223,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -288,25 +280,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index 0d09d1a05..24887f577 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -62,10 +62,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -227,10 +223,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -288,25 +280,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################" diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 672615bfa..7b3f36534 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -62,10 +62,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -227,10 +223,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -284,25 +276,14 @@ prepare_zbx_web_config() { fi } -prepare_web() { - echo "** Preparing Zabbix web-interface" - - check_variables - check_db_connect - prepare_web_server - prepare_zbx_web_config -} - - ################################################# echo "** Deploying Zabbix web-interface (Nginx) with PostgreSQL database" -prepare_system - -prepare_web - -clear_deploy +check_variables +check_db_connect +prepare_web_server +prepare_zbx_web_config echo "########################################################"