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

Fix pargs.letsencyrpt

Browse Source
This commit is contained in:
VirtuBox
2019-07-16 17:15:17 +02:00
parent ed4df166ce
commit 67c9c096ce
4 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install
View File

@@ -185,9 +185,9 @@ wo_install_dep() {
wget https://download.opensuse.org/repositories/home:virtubox:WordOps/Debian_9.0/Release.key -O Release.key wget https://download.opensuse.org/repositories/home:virtubox:WordOps/Debian_9.0/Release.key -O Release.key
apt-key add - < Release.key apt-key add - < Release.key
rm -f Release.key rm -f Release.key
[ -d /etc/apt/trusted.gpg.d ] && { wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; }
# install dependencies # install dependencies
DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip dirmngr sudo python3 python3-apt python3-setuptools python3-dev ca-certificates sqlite3 git tar software-properties-common pigz apt-transport-https gnupg2 cron ccze rsync tree haveged ufw > /dev/null 2>&1 DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install build-essential curl gzip dirmngr sudo python3 python3-apt python3-setuptools python3-dev ca-certificates sqlite3 git tar software-properties-common pigz apt-transport-https gnupg2 cron ccze rsync tree haveged ufw > /dev/null 2>&1
[ -d /etc/apt/trusted.gpg.d ] && { wget -qO /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; }
fi fi
locale-gen en locale-gen en

1
wo/cli/plugins/site.py
View File

@@ -360,6 +360,7 @@ class WOSiteCreateController(CementBaseController):
@expose(hide=True) @expose(hide=True)
def default(self): def default(self):
pargs = self.app.pargs
# self.app.render((data), 'default.mustache') # self.app.render((data), 'default.mustache')
# Check domain name validation # Check domain name validation
data = dict() data = dict()

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

@@ -1538,12 +1538,14 @@ class WOStackController(CementBaseController):
# PHPMYADMIN # PHPMYADMIN
if self.app.pargs.phpmyadmin: if self.app.pargs.phpmyadmin:
Log.debug(self, "Setting packages variable for phpMyAdmin ") if not os.path.isdir('/var/www/22222/htdocs/db/pma'):
self.app.pargs.composer = True Log.debug(self, "Setting packages variable "
packages = packages + [["https://github.com/phpmyadmin/" "for phpMyAdmin ")
"phpmyadmin/archive/STABLE.tar.gz", self.app.pargs.composer = True
"/var/lib/wo/tmp/pma.tar.gz", packages = packages + [["https://github.com/phpmyadmin/"
"phpMyAdmin"]] "phpmyadmin/archive/STABLE.tar.gz",
"/var/lib/wo/tmp/pma.tar.gz",
"phpMyAdmin"]]
# Composer # Composer
if self.app.pargs.composer: if self.app.pargs.composer:
Log.debug(self, "Setting packages variable for Composer ") Log.debug(self, "Setting packages variable for Composer ")
@@ -1552,16 +1554,16 @@ class WOStackController(CementBaseController):
"Composer"]] "Composer"]]
# PHPREDISADMIN # PHPREDISADMIN
if self.app.pargs.phpredisadmin: if self.app.pargs.phpredisadmin:
Log.debug(self, "Setting packages variable for phpRedisAdmin") if not os.path.isdir('/var/www/22222/htdocs/cache/redis'):
self.app.pargs.composer = True Log.debug(
packages = packages + [["https://github.com/erikdubbelboer/" self, "Setting packages variable for phpRedisAdmin")
"phpRedisAdmin/archive/v1.11.3.tar.gz", self.app.pargs.composer = True
"/var/lib/wo/tmp/pra.tar.gz", packages = packages + [["https://github.com/"
"phpRedisAdmin"], "erikdubbelboer/"
["https://github.com/nrk/predis/" "phpRedisAdmin/archive"
"archive/v1.1.1.tar.gz", "/ v1.11.3.tar.gz",
"/var/lib/wo/tmp/predis.tar.gz", "/var/lib/wo/tmp/pra.tar.gz",
"Predis"]] "phpRedisAdmin"]]
# ADMINER # ADMINER
if self.app.pargs.adminer: if self.app.pargs.adminer:
Log.debug(self, "Setting packages variable for Adminer ") Log.debug(self, "Setting packages variable for Adminer ")
@@ -1592,17 +1594,19 @@ class WOStackController(CementBaseController):
# WordOps Dashboard # WordOps Dashboard
if self.app.pargs.dashboard: if self.app.pargs.dashboard:
Log.debug(self, "Setting packages variable for WO-Dashboard") if not os.path.isfile('/var/www/22222/htdocs/index.php'):
packages = packages + \ Log.debug(
[["https://github.com/WordOps/" self, "Setting packages variable for WO-Dashboard")
"wordops-dashboard/releases/" packages = packages + \
"download/v1.0/wo-dashboard.tar.gz", [["https://github.com/WordOps/"
"/var/lib/wo/tmp/wo-dashboard.tar.gz", "wordops-dashboard/releases/"
"WordOps Dashboard"], "download/v1.0/wo-dashboard.tar.gz",
["https://github.com/soerennb/" "/var/lib/wo/tmp/wo-dashboard.tar.gz",
"extplorer/archive/v2.1.11.tar.gz", "WordOps Dashboard"],
"/var/lib/wo/tmp/extplorer.tar.gz", ["https://github.com/soerennb/"
"eXtplorer"]] "extplorer/archive/v2.1.11.tar.gz",
"/var/lib/wo/tmp/extplorer.tar.gz",
"eXtplorer"]]
# UTILS # UTILS
if self.app.pargs.utils: if self.app.pargs.utils:

20
wo/cli/plugins/stack_upgrade.py
View File

@@ -85,7 +85,7 @@ class WOStackUpgradeController(CementBaseController):
if ((not self.app.pargs.web) and (not self.app.pargs.nginx) and if ((not self.app.pargs.web) and (not self.app.pargs.nginx) and
(not self.app.pargs.php) and (not self.app.pargs.mysql) and (not self.app.pargs.php) and (not self.app.pargs.mysql) and
(not self.app.pargs.all) and (not self.app.pargs.wpcli) and (not self.app.pargs.all) and (not self.app.pargs.wpcli) and
(not self.app.pargs.netdata) and (not self.app.pargs.netdata) and (not self.app.pargs.composer)
(not self.app.pargs.phpmyadmin) and (not self.app.pargs.phpmyadmin) and
(not self.app.pargs.redis)): (not self.app.pargs.redis)):
self.app.pargs.web = True self.app.pargs.web = True
@@ -161,6 +161,14 @@ class WOStackUpgradeController(CementBaseController):
else: else:
Log.error(self, "phpMyAdmin isn't installed") Log.error(self, "phpMyAdmin isn't installed")
if self.app.pargs.composer:
if os.path.isfile('/usr/local/bin/composer'):
packages = packages + [["https://getcomposer.org/installer",
"/var/lib/wo/tmp/composer-install",
"Composer"]]
else:
Log.error(self, "Composer isn't installed")
if len(packages) or len(apt_packages): if len(packages) or len(apt_packages):
Log.info(self, "During package update process non nginx-cached" Log.info(self, "During package update process non nginx-cached"
@@ -206,6 +214,16 @@ class WOStackUpgradeController(CementBaseController):
WOShellExec.cmd_exec(self, "/bin/bash /var/lib/wo/tmp/" WOShellExec.cmd_exec(self, "/bin/bash /var/lib/wo/tmp/"
"kickstart.sh " "kickstart.sh "
"--dont-wait") "--dont-wait")
if self.app.pargs.composer:
Log.info(self, "Upgrading Composer, please wait...")
WOShellExec.cmd_exec(self, "php -q /var/lib/wo"
"/tmp/composer-install "
"--install-dir=/var/lib/wo/tmp/")
shutil.copyfile('/var/lib/wo/tmp/composer.phar',
'/usr/local/bin/composer')
WOFileUtils.chmod(self, "/usr/local/bin/composer", 0o775)
if self.app.pargs.phpmyadmin: if self.app.pargs.phpmyadmin:
Log.info(self, "Upgrading phpMyAdmin, please wait...") Log.info(self, "Upgrading phpMyAdmin, please wait...")
WOExtract.extract( WOExtract.extract(