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

Fix Netdata stack install

Browse Source
This commit is contained in:
VirtuBox
2022-02-01 14:46:58 +01:00
parent 88e358f36c
commit 4b71d22467
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -429,16 +429,10 @@ class WOStackController(CementBaseController):
os.path.isdir("/etc/netdata")): os.path.isdir("/etc/netdata")):
Log.debug( Log.debug(
self, "Setting packages variable for Netdata") self, "Setting packages variable for Netdata")
if WOVar.wo_distro == 'raspbian': packages = packages + [['https://my-netdata.io/'
packages = packages + [['https://my-netdata.io/' 'kickstart.sh',
'kickstart.sh', '/var/lib/wo/tmp/kickstart.sh',
'/var/lib/wo/tmp/kickstart.sh', 'Netdata']]
'Netdata']]
else:
packages = packages + [['https://my-netdata.io/'
'kickstart-static64.sh',
'/var/lib/wo/tmp/kickstart.sh',
'Netdata']]
else: else:
Log.debug(self, "Netdata already installed") Log.debug(self, "Netdata already installed")
Log.info(self, "Netdata already installed") Log.info(self, "Netdata already installed")

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

@@ -1747,7 +1747,8 @@ def post_pref(self, apt_packages, packages, upgrade=False):
Log.wait(self, "Installing Netdata") Log.wait(self, "Installing Netdata")
WOShellExec.cmd_exec( WOShellExec.cmd_exec(
self, "bash /var/lib/wo/tmp/kickstart.sh " self, "bash /var/lib/wo/tmp/kickstart.sh "
"--dont-wait --no-updates", errormsg='', log=False) "--dont-wait --no-updates --static-only",
errormsg='', log=False)
Log.valide(self, "Installing Netdata") Log.valide(self, "Installing Netdata")
if os.path.isdir('/etc/netdata'): if os.path.isdir('/etc/netdata'):
wo_netdata = "/" wo_netdata = "/"

3
wo/core/aptget.py
View File

@@ -99,7 +99,8 @@ class WOAptGet():
"--option=Dpkg::options::=--force-confdef " "--option=Dpkg::options::=--force-confdef "
"--option=Dpkg::options::=--force-unsafe-io " "--option=Dpkg::options::=--force-unsafe-io "
"--option=Dpkg::options::=--force-confold " "--option=Dpkg::options::=--force-confold "
"--assume-yes --quiet dist-upgrade", "--assume-yes --quiet --allow-downgrades "
"dist-upgrade",
shell=True, stdin=None, shell=True, stdin=None,
stdout=f, stderr=f, stdout=f, stderr=f,
executable="/bin/bash") executable="/bin/bash")