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

Merge pull request #321 from WordOps/updating-configuration

Browse Source 
WordOps Maintenance Release v3.12.3
This commit is contained in:
VirtuBox
2020-10-13 18:28:01 +02:00
committed by GitHub
parent 71926580fd 1242d29db3
commit 62c5150405
9 changed files with 83 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wo/cli/plugins/site_functions.py
View File

@@ -219,7 +219,11 @@ def setupdatabase(self, data):
Log.debug(self, "Setting up user privileges")
try:
WOMysql.execute(self,
"grant select, insert, update, delete, create, drop, references, index, alter, create temporary tables, lock tables, execute, create view, show view, create routine, alter routine, event, trigger on `{0}`.* to `{1}`@`{2}`"
"grant select, insert, update, delete, create, drop, "
"references, index, alter, create temporary tables, "
"lock tables, execute, create view, show view, "
"create routine, alter routine, event, "
"trigger on `{0}`.* to `{1}`@`{2}`"
.format(wo_db_name,
wo_db_username, wo_mysql_grant_host))
except StatementExcecutionError:
@@ -806,8 +810,8 @@ def sitebackup(self, data):
Log.info(self, 'Backing up database \t\t', end='')
try:
if not WOShellExec.cmd_exec(self, "mysqldump --single-transaction "
"{0} | pigz -9 -p\"$(nproc)\" "
"> {1}/{0}.gz"
"{0} | zstd -T0 -c"
"> {1}/{0}.zst"
.format(data['wo_db_name'],
backup_path)):
Log.info(self,

2
wo/cli/templates/proftpd-tls.mustache
View File

@@ -5,7 +5,7 @@ TLSRequired on
TLSLog /var/log/proftpd/tls.log
# intermediate configuration from ssl-config.mozilla.org
TLSProtocol TLSv1.2 TLSv1.3
TLSProtocol TLSv1.2
TLSCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
TLSServerCipherPreference off
TLSessionTickets off

3
wo/core/mysql.py
View File

@@ -112,7 +112,8 @@ class WOMysql():
"--single-transaction ".format(dbs),
stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
p2 = subprocess.Popen(
"/usr/bin/pigz -c > /var/lib/wo-backup/mysql/{0}{1}.sql.gz"
"/usr/bin/zstd -T0 -c > "
"/var/lib/wo-backup/mysql/{0}{1}.sql.zst"
.format(dbs, WOVar.wo_date), stdin=p1.stdout, shell=True)
# Allow p1 to receive a SIGPIPE if p2 exits
p1.stdout.close()

13
wo/core/variables.py
View File

@@ -14,7 +14,7 @@ class WOVar():
"""Intialization of core variables"""
# WordOps version
wo_version = "3.12.2"
wo_version = "3.12.3"
# WordOps packages versions
wo_wp_cli = "2.4.0"
wo_adminer = "4.7.5"
@@ -137,7 +137,9 @@ class WOVar():
"readline", "common",
"cli", "mbstring", "intl",
"bcmath", "mysql", "opcache",
"zip", "xml", "soap"]
"zip", "xml", "soap", "memcached",
"imagick", "igbinary", "msgpack",
"redis", "xdebug"]
wo_php72 = []
for module in wo_module:
wo_php72 = wo_php72 + ["php7.2-{0}".format(module)]
@@ -150,12 +152,7 @@ class WOVar():
for module in wo_module:
wo_php74 = wo_php74 + ["php7.4-{0}".format(module)]
if not wo_platform_codename == 'focal':
wo_php_extra = ["php-memcached", "php-imagick", "php-igbinary",
"graphviz", "php-xdebug", "php-msgpack", "php-redis"]
else:
wo_php_extra = ["php-imagick", "php-igbinary",
"graphviz", "php-xdebug", "php-msgpack", "php-redis"]
wo_php_extra = ["graphviz"]
wo_mysql = ["mariadb-server", "percona-toolkit"]
if wo_distro == 'raspbian':