From d988d8b6af01f68afc60a36f8955b1e6f2bc952e Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 3 Apr 2019 11:32:35 +0200 Subject: [PATCH] fix wo info --- .travis.yml | 1 - CHANGELOG.md | 4 ++-- install | 4 ++-- wo/cli/plugins/info.py | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc63fb7..e1898ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,4 +64,3 @@ script: - sudo bash -c 'tar -I pigz -cf wordops.tar.gz /var/log/wo' - sudo curl --progress-bar --upload-file "wordops.tar.gz" https://transfer.vtbox.net/$(basename wordops.tar.gz) && echo "" || sudo echo "transfer.sh is down" - sudo tree -L 2 /etc/nginx - - sudo tree -L 4 /var/www/22222 diff --git a/CHANGELOG.md b/CHANGELOG.md index 07c70dc..6ed4b35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Previous acme.sh certs migration - "wo maintenance" command to perform server package update & cleanup - Support for Netdata on backend : https://server.hostname:22222/netdata/ -- Stack : composer and netdata +- New Stacks : composer and netdata #### Changed @@ -50,7 +50,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - PHP 7.2 & PHP 7.3 pool configuration during upgrade - WordOps backup directory creation before upgrade - EasyEngine database sync during migration -- command "wo info" +- fix command "wo info" - phpmyadmin install with composer - command "wo clean --memcached" diff --git a/install b/install index 518e345..213832c 100644 --- a/install +++ b/install @@ -145,10 +145,10 @@ wo_install_dep() { { if [ "$wo_linux_distro" == "Ubuntu" ]; then - DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 fail2ban cron ccze rsync tree > /dev/null 2>&1 + DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common pigz gnupg2 fail2ban cron ccze rsync tree haveged ufw > /dev/null 2>&1 else wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip dirmngr sudo python3 python3-apt python3-setuptools python3-dev ca-certificates sqlite3 git tar software-properties-common pigz apt-transport-https gnupg2 fail2ban cron ccze rsync tree > /dev/null 2>&1 + DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip dirmngr sudo python3 python3-apt python3-setuptools python3-dev ca-certificates sqlite3 git tar software-properties-common pigz apt-transport-https gnupg2 fail2ban cron ccze rsync tree haveged ufw > /dev/null 2>&1 fi locale-gen en diff --git a/wo/cli/plugins/info.py b/wo/cli/plugins/info.py index 4f0025f..d20d5a6 100644 --- a/wo/cli/plugins/info.py +++ b/wo/cli/plugins/info.py @@ -252,7 +252,7 @@ class WOInfoController(CementBaseController): if self.app.pargs.nginx: if (WOAptGet.is_installed(self, 'nginx-custom') or - WOAptGet.is_installed(self, 'nginx-common')): + WOAptGet.is_installed(self, 'nginx-wo')): self.info_nginx() else: Log.error(self, "Nginx is not installed")