update travis & stack
This commit is contained in:
@@ -150,13 +150,11 @@ class WOStackController(CementBaseController):
|
||||
if set(WOVariables.wo_nginx).issubset(set(apt_packages)):
|
||||
Log.info(self, "Adding repository for NGINX, please wait...")
|
||||
WORepo.add(self, repo_url=WOVariables.wo_nginx_repo)
|
||||
Log.debug(self, 'Adding ppa of Nginx')
|
||||
|
||||
try:
|
||||
WOShellExec.cmd_exec(self, "wget -qO - https://build"
|
||||
".opensuse.org/"
|
||||
"projects/home:virtubox/public_key"
|
||||
" | sudo apt-key add -", log=False)
|
||||
Log.debug(self, 'Adding repository for Nginx')
|
||||
WOShellExec.cmd_exec(self, "wget -qO - https://build"
|
||||
".opensuse.org/"
|
||||
"projects/home:virtubox/public_key |"
|
||||
"sudo apt-key add -")
|
||||
except CommandExecutionError as e:
|
||||
Log.error("Failed to add Nginx repository key")
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ class WOStackUpgradeController(CementBaseController):
|
||||
Log.info(self, "Updating apt-cache, please wait...")
|
||||
WOAptGet.update(self)
|
||||
Log.info(self, "Installing packages, please wait ...")
|
||||
if (WOVariables.wo_platform_codename == 'trusty' or WOVariables.wo_platform_codename == 'xenial' or WOVariables.wo_platform_codename == 'bionic'):
|
||||
if (WOVariables.wo_platform_distro == 'ubuntu'):
|
||||
WOAptGet.install(self, WOVariables.wo_php + WOVariables.wo_php_extra)
|
||||
else:
|
||||
WOAptGet.install(self, WOVariables.wo_php)
|
||||
|
||||
@@ -23,7 +23,8 @@ class WOUpdateController(CementBaseController):
|
||||
@expose(hide=True)
|
||||
def default(self):
|
||||
filename = "woupdate" + time.strftime("%Y%m%d-%H%M%S")
|
||||
WODownload.download(self, [["https://raw.githubusercontent.com/WordOps/WordOps/master/install",
|
||||
WODownload.download(self, [["https://raw.githubusercontent.com/"
|
||||
"WordOps/WordOps/master/install",
|
||||
"/tmp/{0}".format(filename),
|
||||
"update script"]])
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user