njalla.nix: fail on ImportError; fix redundant except clause
Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
co-authored by
naturallaw777
parent
947c04834d
commit
3f233beea0
@@ -76,7 +76,7 @@ sys.path.insert(0, '/etc/sovran')
|
|||||||
try:
|
try:
|
||||||
from security_helpers import _validate_ddns_url
|
from security_helpers import _validate_ddns_url
|
||||||
except ImportError:
|
except ImportError:
|
||||||
sys.exit(0) # validator not available — skip silently
|
sys.exit(1) # validator missing — fail so systemd logs the misconfiguration
|
||||||
|
|
||||||
URLS_FILE = "/var/lib/njalla/ddns_urls.json"
|
URLS_FILE = "/var/lib/njalla/ddns_urls.json"
|
||||||
|
|
||||||
@@ -116,7 +116,7 @@ for raw_url in urls:
|
|||||||
timeout=20, check=False,
|
timeout=20, check=False,
|
||||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
||||||
)
|
)
|
||||||
except (ValueError, Exception):
|
except Exception:
|
||||||
pass
|
pass
|
||||||
PYEOF
|
PYEOF
|
||||||
chmod 0500 /var/lib/sovran/ddns-update.py
|
chmod 0500 /var/lib/sovran/ddns-update.py
|
||||||
|
|||||||
Reference in New Issue
Block a user