Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix redis link and split apt_packages and packages install process

Browse Source
This commit is contained in:
VirtuBox
2019-07-16 18:51:04 +02:00
parent 67c9c096ce
commit 0f8c9739fc
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wo/cli/plugins/stack.py
View File

@@ -1561,7 +1561,7 @@ class WOStackController(CementBaseController):
packages = packages + [["https://github.com/" packages = packages + [["https://github.com/"
"erikdubbelboer/" "erikdubbelboer/"
"phpRedisAdmin/archive" "phpRedisAdmin/archive"
"/ v1.11.3.tar.gz", "/v1.11.3.tar.gz",
"/var/lib/wo/tmp/pra.tar.gz", "/var/lib/wo/tmp/pra.tar.gz",
"phpRedisAdmin"]] "phpRedisAdmin"]]
# ADMINER # ADMINER
@@ -1654,19 +1654,23 @@ class WOStackController(CementBaseController):
pass pass
if (apt_packages) or (packages): if (apt_packages) or (packages):
Log.debug(self, "Calling pre_pref")
self.pre_pref(apt_packages)
if (apt_packages): if (apt_packages):
Log.debug(self, "Calling pre_pref")
self.pre_pref(apt_packages)
WOSwap.add(self) WOSwap.add(self)
Log.info(self, "Updating apt-cache, please wait...") Log.info(self, "Updating apt-cache, please wait...")
WOAptGet.update(self) WOAptGet.update(self)
Log.info(self, "Installing packages, please wait...") 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): if (packages):
Log.debug(self, "Downloading following: {0}".format(packages)) Log.debug(self, "Downloading following: {0}".format(packages))
WODownload.download(self, packages) WODownload.download(self, packages)
Log.debug(self, "Calling post_pref") Log.debug(self, "Calling post_pref")
self.post_pref(apt_packages, packages) self.post_pref(packages)
if 'redis-server' in apt_packages: if 'redis-server' in apt_packages:
# set redis.conf parameter # set redis.conf parameter
# set maxmemory 10% for ram below 512MB and 20% for others # set maxmemory 10% for ram below 512MB and 20% for others