diff --git a/CHANGELOG.md b/CHANGELOG.md index ead24bb..360a141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - MySQL monitoring with Netdata - WordOps-dashboard on 22222 - Extplorer filemanager +- Enable OSCP Stapling with Let's Encrypt +- Compress database backup with pigz before updating sites #### Changed diff --git a/README.md b/README.md index e379646..8c028b7 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,8 @@ build MIT Commits -GitHub release +GitHub release +

diff --git a/install b/install index e7e6cf7..1dbc233 100755 --- a/install +++ b/install @@ -178,7 +178,7 @@ 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 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 + [ -d /etc/apt/trusted.gpg.d ] && { 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 cron ccze rsync tree haveged ufw > /dev/null 2>&1 fi diff --git a/setup.py b/setup.py index 82c3cde..c302674 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ except Exception as e: print("Your informations will ONLY be stored locally") wo_user = input("Enter your name: ") - while wo_user is "": + while wo_user == "": print("Unfortunately, this can't be left blank") wo_user = input("Enter your name: ") diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index cb20254..693fbab 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -697,7 +697,9 @@ def sitebackup(self, data): if data['wo_db_name']: Log.info(self, 'Backing up database \t\t', end='') try: - if not WOShellExec.cmd_exec(self, "mysqldump --single-transaction {0} | pigz -9 -p\"$(nproc)\" > {1}/{0}.gz" + if not WOShellExec.cmd_exec(self, "mysqldump --single-transaction " + "{0} | pigz -9 -p\"$(nproc)\" " + "> {1}/{0}.gz" .format(data['wo_db_name'], backup_path)): Log.info(self, diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index d9e56f3..e4b2459 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -1159,7 +1159,7 @@ class WOStackController(CementBaseController): WOFileUtils.searchreplace(self, "{0}22222/htdocs/index.php" .format(WOVariables.wo_webroot), "eth0", - "{0}".format(WOVariables.wo_wan_interface)) + "{0}".format(WOVariables.wo_wan)) Log.debug(self, "Setting Privileges to " "{0}22222/htdocs" diff --git a/wo/core/variables.py b/wo/core/variables.py index fd12917..1fae267 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -22,11 +22,11 @@ class WOVariables(): wo_wpcli_path = '/usr/local/bin/wp ' # get wan network interface name - wo_wan_interface = os.popen("ip -4 route get 8.8.8.8 | " - "grep -oP \"dev [^[:space:]]+ \" " - "| cut -d ' ' -f 2").read() - if wo_wan_interface == '': - wo_wan_interface = 'eth0' + wo_wan = os.popen("/sbin/ip -4 route get 8.8.8.8 | " + "grep -oP \"dev [^[:space:]]+ \" " + "| cut -d ' ' -f 2").read() + if wo_wan == '': + wo_wan = 'eth0' # Current date and time of System wo_date = datetime.datetime.now().strftime('%d%b%Y%H%M%S')