From 4b0b504bbcde224b03cce45e919be5d673b21358 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 14 May 2020 00:12:56 +0300 Subject: [PATCH] Removed orphaned code --- web-apache-mysql/alpine/docker-entrypoint.sh | 27 +++----------------- web-apache-mysql/centos/docker-entrypoint.sh | 27 +++----------------- web-apache-mysql/ubuntu/docker-entrypoint.sh | 27 +++----------------- web-apache-pgsql/alpine/docker-entrypoint.sh | 19 +++----------- web-apache-pgsql/centos/docker-entrypoint.sh | 23 +++-------------- web-apache-pgsql/ubuntu/docker-entrypoint.sh | 23 +++-------------- web-nginx-mysql/alpine/docker-entrypoint.sh | 27 +++----------------- web-nginx-mysql/centos/docker-entrypoint.sh | 27 +++----------------- web-nginx-mysql/ubuntu/docker-entrypoint.sh | 27 +++----------------- web-nginx-pgsql/alpine/docker-entrypoint.sh | 27 +++----------------- web-nginx-pgsql/centos/docker-entrypoint.sh | 27 +++----------------- web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 27 +++----------------- 12 files changed, 48 insertions(+), 260 deletions(-) diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index 617ee318b..f66764f3d 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -57,10 +57,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -204,10 +200,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -241,25 +233,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 353c4bba6..8b955c1cf 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -57,10 +57,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -204,10 +200,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -241,25 +233,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 4b24e69bc..f05a37dec 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -57,10 +57,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -204,10 +200,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -241,25 +233,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 77c79bfdf..08c3c92f3 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -234,25 +234,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 19842b7d7..835744359 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -57,10 +57,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -239,25 +235,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 8207e1c2f..d7fee2dd2 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -57,10 +57,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -239,25 +235,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 ba60a4575..87a1548df 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -59,10 +59,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -224,10 +220,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -262,25 +254,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 a8b15134f..f1e5905de 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -59,10 +59,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -224,10 +220,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -262,25 +254,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 71a09fd28..c2857af4b 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -59,10 +59,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -224,10 +220,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -262,25 +254,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 6513702b1..162ed3f1d 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -59,10 +59,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -224,10 +220,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -262,25 +254,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 9a748c5f5..326ce40d8 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -59,10 +59,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -224,10 +220,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -262,25 +254,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 a4c885868..5730f2dd5 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -59,10 +59,6 @@ file_env() { unset "$fileVar" } -prepare_system() { - echo "** Preparing the system" -} - escape_spec_char() { local var_value=$1 @@ -224,10 +220,6 @@ prepare_web_server() { fi } -clear_deploy() { - echo "** Cleaning the system" -} - prepare_zbx_web_config() { local server_name="" @@ -262,25 +254,14 @@ prepare_zbx_web_config() { "$ZBX_WEB_CONFIG" } -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 "########################################################"