Merge branch 'updating-configuration' into master
This commit is contained in:
@@ -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')
|
||||
|
||||
@@ -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'):
|
||||
|
||||
@@ -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
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user