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

Merge pull request #452 from WordOps/updating-configuration

Browse Source 
Prepare for release v3.15.0
This commit is contained in:
VirtuBox
2022-09-09 17:50:23 +02:00
committed by GitHub
parent 9d677dac68 98cf64b85c
commit 5c44a3e9e4
10 changed files with 73 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wo/cli/plugins/stack_pref.py
View File

@@ -126,10 +126,6 @@ def pre_pref(self, apt_packages):
if WOVar.wo_platform_codename == 'bionic':
Log.debug(self, 'Adding ppa for nano')
WORepo.add(self, ppa=WOVar.wo_ubuntu_backports)
elif WOVar.wo_platform_codename == 'xenial':
Log.debug(self, 'Adding ppa for nano')
WORepo.add_key(self, WOVar.wo_nginx_key)
WORepo.add(self, repo_url=WOVar.wo_extra_repo)
else:
if (not WOFileUtils.grepcheck(
self, '/etc/apt/sources.list/wo-repo.list',
@@ -1280,7 +1276,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
msg="Adding MySQL into Git")
elif os.path.exists('/etc/mysql/conf.d/my.cnf'):
if ((WOAptGet.is_installed(
self, 'mariadb-server-10.5')) and
self,
'mariadb-server-{0}'.format(WOVar.mariadb_ver))) and
not (WOFileUtils.grepcheck(
self, '/etc/mysql/conf.d/my.cnf', 'socket'))):
try:
@@ -1351,7 +1348,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
# set innodb_buffer_pool_instances depending
# on the amount of RAM
WOService.restart_service(self, 'mysql')
WOService.restart_service(self, 'mariadb')
# WOFileUtils.mvfile(self, '/var/lib/mysql/ib_logfile0',
# '/var/lib/mysql/ib_logfile0.bak')
@@ -2008,7 +2005,9 @@ def pre_stack(self):
# use tcp_bbr congestion algorithm only on new kernels
if (WOVar.wo_platform_codename == 'bionic' or
WOVar.wo_platform_codename == 'focal' or
WOVar.wo_platform_codename == 'buster'):
WOVar.wo_platform_codename == 'buster' or
WOVar.wo_platform_codename == 'jammy' or
WOVar.wo_platform_codename == 'bullseye'):
try:
WOShellExec.cmd_exec(
self, 'modprobe tcp_bbr')

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

@@ -204,7 +204,7 @@ class WOStackUpgradeController(CementBaseController):
# detect static binaries install
if os.path.isdir('/opt/netdata'):
packages = packages + [[
'https://my-netdata.io/kickstart-static64.sh',
'https://my-netdata.io/kickstart.sh',
'/var/lib/wo/tmp/kickstart.sh', 'Netdata']]
# detect install from source
elif os.path.isdir('/etc/netdata'):

2
wo/cli/templates/my.mustache
View File

@@ -45,7 +45,7 @@ skip-external-locking
#
# Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure.
bind-address = ::ffff:127.0.0.1
bind-address = localhost
#
# * Fine Tuning
#

3
wo/cli/templates/tweaks.mustache
View File

@@ -1,9 +1,6 @@
# NGINX Tweaks - WordOps {{release}}
directio 4m;
directio_alignment 512;
#http2_max_field_size 16k;
#http2_max_header_size 32k;
large_client_header_buffers 8 64k;
postpone_output 1460;

38
wo/core/variables.py
View File

@@ -1,12 +1,13 @@
"""WordOps core variable module"""
import configparser
import os
import sys
from datetime import datetime
from re import match
from socket import getfqdn
from shutil import copy2
from distro import linux_distribution
from distro import distro, linux_distribution
from sh import git
@@ -14,11 +15,11 @@ class WOVar():
"""Intialization of core variables"""
# WordOps version
wo_version = "3.14.2"
wo_version = "3.15.0"
# WordOps packages versions
wo_wp_cli = "2.6.0"
wo_adminer = "4.8.1"
wo_phpmyadmin = "5.0.2"
wo_phpmyadmin = "5.2.0"
wo_extplorer = "2.1.13"
wo_dashboard = "1.2"
@@ -30,13 +31,19 @@ class WOVar():
# WordOps core variables
# linux distribution
wo_distro = linux_distribution(
full_distribution_name=False)[0].lower()
wo_platform_version = linux_distribution(
full_distribution_name=False)[1].lower()
# distro codename (bionic, xenial, stretch ...)
wo_platform_codename = linux_distribution(
full_distribution_name=False)[2].lower()
if sys.version_info <= (3, 7):
wo_distro = linux_distribution(
full_distribution_name=False)[0].lower()
wo_platform_version = linux_distribution(
full_distribution_name=False)[1].lower()
# distro codename (bionic, xenial, stretch ...)
wo_platform_codename = linux_distribution(
full_distribution_name=False)[2].lower()
else:
wo_distro = distro.id()
wo_platform_version = distro.version()
# distro codename (bionic, xenial, stretch ...)
wo_platform_codename = distro.codename()
# Get timezone of system
if os.path.isfile('/etc/timezone'):
@@ -123,11 +130,15 @@ class WOVar():
wo_deb_repo = "Debian_9.0"
elif wo_platform_codename == 'buster':
wo_deb_repo = "Debian_10"
elif wo_platform_codename == 'bullseye':
wo_deb_repo = "Debian_11"
elif wo_distro == 'raspbian':
if wo_platform_codename == 'stretch':
wo_deb_repo = "Raspbian_9.0"
elif wo_platform_codename == 'buster':
wo_deb_repo = "Raspbian_10"
elif wo_platform_codename == 'bullseye':
wo_deb_repo = "Raspbian_11"
# debian/raspbian nginx repository
wo_nginx_repo = ("deb http://download.opensuse.org"
"/repositories/home:"
@@ -171,7 +182,7 @@ class WOVar():
else:
mariadb_ver = '10.3'
else:
mariadb_ver = '10.5'
mariadb_ver = '10.6'
wo_mysql = wo_mysql + ["mariadb-backup"]
wo_mysql_client = ["mariadb-client", "python3-mysqldb"]
@@ -183,8 +194,9 @@ class WOVar():
# APT repositories
wo_mysql_repo = ("deb [arch=amd64,arm64,ppc64el] "
"http://mariadb.mirrors.ovh.net/MariaDB/repo/"
"10.5/{distro} {codename} main"
.format(distro=wo_distro,
"{version}/{distro} {codename} main"
.format(version=mariadb_ver,
distro=wo_distro,
codename=wo_platform_codename))
if wo_distro == 'ubuntu':
wo_php_repo = "ppa:ondrej/php"