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

Merge pull request #650 from WordOps/updating-configuration

Browse Source 
Log less data in WordOps logs
This commit is contained in:
VirtuBox
2024-05-23 15:29:35 +02:00
committed by GitHub
parent 3b97f84e5d 35f8d5f988
commit b4efe87794
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
install
View File

@@ -903,7 +903,6 @@ else
echo echo
wo_lib_echo "WordOps Documentation : https://docs.wordops.net" wo_lib_echo "WordOps Documentation : https://docs.wordops.net"
wo_lib_echo "WordOps Community Forum : https://community.wordops.net" wo_lib_echo "WordOps Community Forum : https://community.wordops.net"
wo_lib_echo "WordOps Community Chat : https://chat.wordops.net"
echo echo
wo_lib_echo "Give WordOps a GitHub star : https://github.com/WordOps/WordOps/" wo_lib_echo "Give WordOps a GitHub star : https://github.com/WordOps/WordOps/"
echo echo

8
wo/core/acme.py
View File

@@ -1,8 +1,6 @@
import csv import csv
import os import os
import requests
from wo.core.fileutils import WOFileUtils from wo.core.fileutils import WOFileUtils
from wo.core.git import WOGit from wo.core.git import WOGit
from wo.core.logging import Log from wo.core.logging import Log
@@ -55,7 +53,7 @@ class WOAcme:
WOAcme.check_acme(self) WOAcme.check_acme(self)
acme_list = WOShellExec.cmd_exec_stdout( acme_list = WOShellExec.cmd_exec_stdout(
self, "{0} ".format(WOAcme.wo_acme_exec) + self, "{0} ".format(WOAcme.wo_acme_exec) +
"--list --listraw") "--list --listraw", log=False)
if acme_list: if acme_list:
WOFileUtils.textwrite(self, '/var/lib/wo/cert.csv', acme_list) WOFileUtils.textwrite(self, '/var/lib/wo/cert.csv', acme_list)
WOFileUtils.chmod(self, '/var/lib/wo/cert.csv', 0o600) WOFileUtils.chmod(self, '/var/lib/wo/cert.csv', 0o600)
@@ -94,7 +92,7 @@ class WOAcme:
if not WOShellExec.cmd_exec( if not WOShellExec.cmd_exec(
self, "{0} ".format(WOAcme.wo_acme_exec) + self, "{0} ".format(WOAcme.wo_acme_exec) +
"--issue -d '{0}' {1} -k {2} -f" "--issue -d '{0}' {1} -k {2} -f"
.format(all_domains, acme_mode, keylenght)): .format(all_domains, acme_mode, keylenght), log=False):
Log.failed(self, "Issuing SSL cert with acme.sh") Log.failed(self, "Issuing SSL cert with acme.sh")
if acmedata['dns'] is True: if acmedata['dns'] is True:
Log.error( Log.error(
@@ -174,7 +172,7 @@ class WOAcme:
try: try:
WOShellExec.cmd_exec( WOShellExec.cmd_exec(
self, "{0} ".format(WOAcme.wo_acme_exec) + self, "{0} ".format(WOAcme.wo_acme_exec) +
"--renew -d {0} --ecc --force".format(domain)) "--renew -d {0} --ecc --force".format(domain), log=False)
except CommandExecutionError as e: except CommandExecutionError as e:
Log.debug(self, str(e)) Log.debug(self, str(e))
Log.error(self, 'Unable to renew certificate') Log.error(self, 'Unable to renew certificate')