diff --git a/lib/install b/lib/install index a535dc6..d86f9ef 100644 --- a/lib/install +++ b/lib/install @@ -368,7 +368,6 @@ nginx_tool() { # Install LetsEncrypt sudo apt-get -y install letsencrypt - conf_write web-tool true conf_write nginx-tool true api-events_update in10 } @@ -413,7 +412,6 @@ php_tool() { sudo apt-get -y install postfix sudo service php*-fpm reload - conf_write web-tool true conf_write php-tool true api-events_update ip8 } diff --git a/lib/webin b/lib/webin index 490d973..4a83426 100644 --- a/lib/webin +++ b/lib/webin @@ -213,26 +213,22 @@ webinoly_verify() { fi # Web Tools - if [[ ! -d /etc/redis && $(conf_read web-tool) == "true" && $(conf_read php_tool) == "true" ]]; then + if [[ ! -d /etc/redis && $(conf_read php_tool) == "true" ]]; then echo "[ERROR] Folder: /etc/redis not found!" error="1" fi - if [[ ! -d /etc/postfix && $(conf_read web-tool) == "true" && $(conf_read php_tool) == "true" ]]; then + if [[ ! -d /etc/postfix && $(conf_read php_tool) == "true" ]]; then echo "[ERROR] Folder: /etc/postfix not found!" error="1" fi - if [[ ! -a /usr/bin/duplicity && $(conf_read web-tool) == "true" && $(conf_read nginx_tool) == "true" ]]; then + if [[ ! -a /usr/bin/duplicity && $(conf_read nginx_tool) == "true" ]]; then echo "[ERROR] File: /usr/bin/duplicity not found!" error="1" fi - if [[ ! -a /usr/bin/letsencrypt && $(conf_read web-tool) == "true" && $(conf_read nginx_tool) == "true" ]]; then + if [[ ! -a /usr/bin/letsencrypt && $(conf_read nginx_tool) == "true" ]]; then echo "[ERROR] File: /usr/bin/letsencrypt not found!" error="1" fi - if [[ ( -d /etc/redis || -d /etc/postfix || -a /usr/bin/duplicity || -a /usr/bin/letsencrypt ) && $(conf_read web-tool) != "true" ]]; then - echo "[WARNING] Seems like Web Tools (Redis, Letsencrypt, Postfix and Duplicity) are enabled but Webinoly can not detect it!" - warning="1" - fi echo "" @@ -340,9 +336,6 @@ config_load() { stack -pma fi - if [[ $(conf_load_read web-tool) == "purged" ]]; then - stack -web-tools -purge - fi # Some user preferences if [[ -n $(conf_load_read tools-port) ]]; then diff --git a/plugins/stack b/plugins/stack index 60a77f3..01e2556 100644 --- a/plugins/stack +++ b/plugins/stack @@ -2,7 +2,7 @@ # Server Stack Manager # Syntax: stack