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

Fix wo stack install --all

Browse Source
This commit is contained in:
VirtuBox
2019-08-29 18:57:19 +02:00
parent 09fa78b92a
commit 81b171943a
2 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -15,6 +15,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix Netdata install on Raspbian 9/10 - Fix Netdata install on Raspbian 9/10
- `wo stack remove/purge` confirmation - `wo stack remove/purge` confirmation
- Nginx error after removing a SSL certificate used to secure WordOps backend - Nginx error after removing a SSL certificate used to secure WordOps backend
- `wo stack install --all`
#### Changed
- updated OpCache Control Panel to v0.2.0
### v3.9.8.4 - 2019-08-28 ### v3.9.8.4 - 2019-08-28

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

@@ -238,7 +238,8 @@ class WOStackController(CementBaseController):
# WP-CLI # WP-CLI
if pargs.wpcli: if pargs.wpcli:
Log.debug(self, "Setting packages variable for WP-CLI") Log.debug(self, "Setting packages variable for WP-CLI")
if not WOShellExec.cmd_exec(self, "command -v wp"): if (not os.path.isfile("/usr/local/bin/wp") and not
os.path.isfile("/usr/bin/wp")):
packages = packages + [["https://github.com/wp-cli/wp-cli/" packages = packages + [["https://github.com/wp-cli/wp-cli/"
"releases/download/v{0}/" "releases/download/v{0}/"
"wp-cli-{0}.phar" "wp-cli-{0}.phar"
@@ -308,8 +309,8 @@ class WOStackController(CementBaseController):
Log.info(self, "phpRedisAdmin already installed") Log.info(self, "phpRedisAdmin already installed")
# Composer # Composer
if pargs.composer and (not if pargs.composer:
os.path.isfile('/usr/local/bin/composer')): if not os.path.isfile('/usr/local/bin/composer'):
Log.debug(self, "Setting packages variable for Composer ") Log.debug(self, "Setting packages variable for Composer ")
packages = packages + [["https://getcomposer.org/" packages = packages + [["https://getcomposer.org/"
"installer", "installer",
@@ -320,10 +321,10 @@ class WOStackController(CementBaseController):
Log.info(self, "Composer already installed") Log.info(self, "Composer already installed")
# ADMINER # ADMINER
if pargs.adminer and (not if pargs.adminer:
os.path.isfile("{0}22222/htdocs/db/" if not os.path.isfile("{0}22222/htdocs/db/"
"adminer/index.php" "adminer/index.php"
.format(wo_webroot))): .format(wo_webroot)):
Log.debug(self, "Setting packages variable for Adminer ") Log.debug(self, "Setting packages variable for Adminer ")
packages = packages + [["https://github.com/vrana/adminer/" packages = packages + [["https://github.com/vrana/adminer/"
"releases/download/v{0}" "releases/download/v{0}"
@@ -341,9 +342,10 @@ class WOStackController(CementBaseController):
.format(WOVariables.wo_webroot), .format(WOVariables.wo_webroot),
"Adminer theme"]] "Adminer theme"]]
# mysqltuner # mysqltuner
if pargs.mysqltuner and (not if pargs.mysqltuner:
os.path.isfile("/usr/bin/mysqltuner")): if not os.path.isfile("/usr/bin/mysqltuner"):
Log.debug(self, "Setting packages variable for MySQLTuner ") Log.debug(self, "Setting packages variable "
"for MySQLTuner ")
packages = packages + [["https://raw." packages = packages + [["https://raw."
"githubusercontent.com/" "githubusercontent.com/"
"major/MySQLTuner-perl" "major/MySQLTuner-perl"
@@ -352,10 +354,11 @@ class WOStackController(CementBaseController):
"MySQLTuner"]] "MySQLTuner"]]
# Netdata # Netdata
if pargs.netdata and ( if pargs.netdata:
not os.path.isdir('/opt/netdata') and not if (not os.path.isdir('/opt/netdata') and not
os.path.isdir("/etc/netdata")): os.path.isdir("/etc/netdata")):
Log.debug(self, "Setting packages variable for Netdata") Log.debug(
self, "Setting packages variable for Netdata")
if WOVariables.wo_distro == 'raspbian': if WOVariables.wo_distro == 'raspbian':
packages = packages + [['https://my-netdata.io/' packages = packages + [['https://my-netdata.io/'
'kickstart.sh', 'kickstart.sh',
@@ -375,9 +378,11 @@ class WOStackController(CementBaseController):
if not os.path.isfile('/var/www/22222/htdocs/index.php'): if not os.path.isfile('/var/www/22222/htdocs/index.php'):
Log.debug(self, Log.debug(self,
"Setting packages variable for WO-Dashboard") "Setting packages variable for WO-Dashboard")
packages = packages + \ packages = \
[["https://github.com/WordOps/wordops-dashboard/" packages + [["https://github.com/WordOps"
"releases/download/v{0}/wordops-dashboard.tar.gz" "/wordops-dashboard/"
"releases/download/v{0}/"
"wordops-dashboard.tar.gz"
.format(WOVariables.wo_dashboard), .format(WOVariables.wo_dashboard),
"/var/lib/wo/tmp/wo-dashboard.tar.gz", "/var/lib/wo/tmp/wo-dashboard.tar.gz",
"WordOps Dashboard"]] "WordOps Dashboard"]]
@@ -421,9 +426,8 @@ class WOStackController(CementBaseController):
"cache/opcache/opgui.php" "cache/opcache/opgui.php"
.format(WOVariables.wo_webroot), .format(WOVariables.wo_webroot),
"Opgui"], "Opgui"],
["https://gist.github.com/ck-on/4959032" ["https://raw.githubusercontent.com/"
"/raw/0b871b345fd6cfcd6d2be030c1f33d1" "mlazarov/ocp/master/ocp.php",
"ad6a475cb/ocp.php",
"{0}22222/htdocs/cache/" "{0}22222/htdocs/cache/"
"opcache/ocp.php" "opcache/ocp.php"
.format(WOVariables.wo_webroot), .format(WOVariables.wo_webroot),