From 4b71d2246718b6a1a0b37145e2a4671985dcb973 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 1 Feb 2022 14:46:58 +0100 Subject: [PATCH 1/4] Fix Netdata stack install --- wo/cli/plugins/stack.py | 14 ++++---------- wo/cli/plugins/stack_pref.py | 3 ++- wo/core/aptget.py | 3 ++- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index a792a38..28a69b0 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -429,16 +429,10 @@ class WOStackController(CementBaseController): os.path.isdir("/etc/netdata")): Log.debug( self, "Setting packages variable for Netdata") - if WOVar.wo_distro == 'raspbian': - packages = packages + [['https://my-netdata.io/' - 'kickstart.sh', - '/var/lib/wo/tmp/kickstart.sh', - 'Netdata']] - else: - packages = packages + [['https://my-netdata.io/' - 'kickstart-static64.sh', - '/var/lib/wo/tmp/kickstart.sh', - 'Netdata']] + packages = packages + [['https://my-netdata.io/' + 'kickstart.sh', + '/var/lib/wo/tmp/kickstart.sh', + 'Netdata']] else: Log.debug(self, "Netdata already installed") Log.info(self, "Netdata already installed") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index ff2b143..3d13abb 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -1747,7 +1747,8 @@ def post_pref(self, apt_packages, packages, upgrade=False): Log.wait(self, "Installing Netdata") WOShellExec.cmd_exec( self, "bash /var/lib/wo/tmp/kickstart.sh " - "--dont-wait --no-updates", errormsg='', log=False) + "--dont-wait --no-updates --static-only", + errormsg='', log=False) Log.valide(self, "Installing Netdata") if os.path.isdir('/etc/netdata'): wo_netdata = "/" diff --git a/wo/core/aptget.py b/wo/core/aptget.py index 2fc6277..28f583d 100644 --- a/wo/core/aptget.py +++ b/wo/core/aptget.py @@ -99,7 +99,8 @@ class WOAptGet(): "--option=Dpkg::options::=--force-confdef " "--option=Dpkg::options::=--force-unsafe-io " "--option=Dpkg::options::=--force-confold " - "--assume-yes --quiet dist-upgrade", + "--assume-yes --quiet --allow-downgrades " + "dist-upgrade", shell=True, stdin=None, stdout=f, stderr=f, executable="/bin/bash") From f1f84fdde1f97f66f001902fd2ab0b1bfe4e8d16 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 16 Feb 2022 14:35:58 +0100 Subject: [PATCH 2/4] Fix php upstream in WordOps backend --- README.md | 1 - wo/cli/templates/upstream.mustache | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 39c0ed5..418220c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ Commits GitHub release
PyPI - Downloads -codacy Badge Twitter Badge Rocket.chat

diff --git a/wo/cli/templates/upstream.mustache b/wo/cli/templates/upstream.mustache index 9838068..5b93f7e 100644 --- a/wo/cli/templates/upstream.mustache +++ b/wo/cli/templates/upstream.mustache @@ -154,4 +154,6 @@ upstream multiphp { server unix:/var/run/php/php73-fpm.sock; server unix:/var/run/php/php74-fpm.sock; server unix:/var/run/php/php72-fpm.sock; + server unix:/var/run/php/php80-fpm.sock; + server unix:/var/run/php/php81-fpm.sock; } \ No newline at end of file From c50b6a78031ba8ec29f40c4ddd06c297e39e058b Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 16 Feb 2022 14:45:51 +0100 Subject: [PATCH 3/4] Prepare for release v3.14.1 --- install | 2 +- setup.py | 2 +- wo/core/variables.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install b/install index c21505a..911f8f5 100755 --- a/install +++ b/install @@ -9,7 +9,7 @@ # ------------------------------------------------------------------------- # wget -qO wo wops.cc && sudo -E bash wo # ------------------------------------------------------------------------- -# Version 3.14.0 - 2022-01-26 +# Version 3.14.1 - 2022-02-16 # ------------------------------------------------------------------------- # CONTENTS diff --git a/setup.py b/setup.py index 1be8c0b..e56455e 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ if os.geteuid() == 0: os.makedirs('/var/lib/wo/tmp/') setup(name='wordops', - version='3.14.0', + version='3.14.1', description='An essential toolset that eases server administration', long_description=LONG, long_description_content_type='text/markdown', diff --git a/wo/core/variables.py b/wo/core/variables.py index d882367..44d3902 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -14,7 +14,7 @@ class WOVar(): """Intialization of core variables""" # WordOps version - wo_version = "3.14.0" + wo_version = "3.14.1" # WordOps packages versions wo_wp_cli = "2.6.0" wo_adminer = "4.8.1" From 8568d1aedac0f964ada53f12afbde27b3a5c8747 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 16 Feb 2022 14:48:24 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3dc02f..f48f647 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.15.0 - [Unreleased] +### v3.14.1 - 2022-02-16 + +#### Fixed + +- Cloudflare IP range script ([PR #422](https://github.com/WordOps/WordOps/pull/422)) +- Netdata stack installation +- Missing php upstream in WordOps backend + ### v3.14.0 - 2022-01-26 #### Added