From 0f8c9739fc9d3d3dc26cab1fb7a7d3a649dbc90f Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 16 Jul 2019 18:51:04 +0200 Subject: [PATCH] Fix redis link and split apt_packages and packages install process --- wo/cli/plugins/stack.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 24aa932..adeb28e 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -1561,7 +1561,7 @@ class WOStackController(CementBaseController): packages = packages + [["https://github.com/" "erikdubbelboer/" "phpRedisAdmin/archive" - "/ v1.11.3.tar.gz", + "/v1.11.3.tar.gz", "/var/lib/wo/tmp/pra.tar.gz", "phpRedisAdmin"]] # ADMINER @@ -1654,19 +1654,23 @@ class WOStackController(CementBaseController): pass if (apt_packages) or (packages): - Log.debug(self, "Calling pre_pref") - self.pre_pref(apt_packages) if (apt_packages): + Log.debug(self, "Calling pre_pref") + self.pre_pref(apt_packages) WOSwap.add(self) Log.info(self, "Updating apt-cache, please wait...") WOAptGet.update(self) Log.info(self, "Installing packages, please wait...") - WOAptGet.install(self, apt_packages) + OAptGet.install(self, apt_packages) + Log.debug(self, "Calling post_pref") + self.post_pref(apt_packages) + if (packages): Log.debug(self, "Downloading following: {0}".format(packages)) WODownload.download(self, packages) - Log.debug(self, "Calling post_pref") - self.post_pref(apt_packages, packages) + Log.debug(self, "Calling post_pref") + self.post_pref(packages) + if 'redis-server' in apt_packages: # set redis.conf parameter # set maxmemory 10% for ram below 512MB and 20% for others