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

Merge branch 'updating-configuration' into master

Browse Source
This commit is contained in:
VirtuBox
2022-09-09 10:48:50 +02:00
committed by GitHub
parent cdbdf2cc22 0b08eb1db8
commit 68a88ea369
8 changed files with 35 additions and 17 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',
@@ -1279,7 +1275,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:
@@ -1350,7 +1347,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')
@@ -2007,7 +2004,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
#

6
wo/core/variables.py
View File

@@ -15,7 +15,7 @@ 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"
@@ -130,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:"