diff options
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf | 2 | ||||
| -rwxr-xr-x | src/conf_mode/dynamic_dns.py | 1 | ||||
| -rwxr-xr-x | src/migration-scripts/system/8-to-9 | 12 | ||||
| -rwxr-xr-x | src/op_mode/wireguard.py | 9 | ||||
| -rwxr-xr-x | src/system/post-upgrade | 3 |
5 files changed, 19 insertions, 8 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf b/data/templates/rsyslog/rsyslog.conf index 0910bd662..ab60fc0f0 100644 --- a/data/templates/rsyslog/rsyslog.conf +++ b/data/templates/rsyslog/rsyslog.conf @@ -9,7 +9,7 @@ $ModLoad imuxsock # provides support for local system logging $ModLoad imklog # provides kernel logging support (previously done by rklogd) #$ModLoad immark # provides --MARK-- message capability -$OmitLocalLogging no +$OmitLocalLogging off $SystemLogSocketName /run/systemd/journal/syslog $KLogPath /proc/kmsg diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py index 90d4ff567..60efcaae2 100755 --- a/src/conf_mode/dynamic_dns.py +++ b/src/conf_mode/dynamic_dns.py @@ -63,6 +63,7 @@ protocol={{ srv.protocol }} max-interval=28d login={{ srv.login }} password='{{ srv.password }}' +server={{ srv.server }} {{ host }} {% endfor %} {% endfor %} diff --git a/src/migration-scripts/system/8-to-9 b/src/migration-scripts/system/8-to-9 index db3fefdea..cd92f3023 100755 --- a/src/migration-scripts/system/8-to-9 +++ b/src/migration-scripts/system/8-to-9 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Deletes "system package" option as it is deprecated +# Deletes the deprecated "system package" and "service telnet" options import sys @@ -17,12 +17,16 @@ with open(file_name, 'r') as f: config = ConfigTree(config_file) -if not config.exists(['system', 'package']): +if (not config.exists(['system', 'package'])) and (not config.exists(['service', 'telnet'])): # Nothing to do sys.exit(0) else: - # Delete the node with the old syntax - config.delete(['system', 'package']) + # Delete the "system package" subtree + if config.exists(['system', 'package']): + config.delete(['system', 'package']) + + if config.exists(['service', 'telnet']): + config.delete(['service', 'telnet']) try: with open(file_name, 'w') as f: diff --git a/src/op_mode/wireguard.py b/src/op_mode/wireguard.py index 14ee66aaf..73da72aa7 100755 --- a/src/op_mode/wireguard.py +++ b/src/op_mode/wireguard.py @@ -49,9 +49,12 @@ def genkey(): """ helper function to check, regenerate the keypair """ old_umask = os.umask(0o077) if os.path.exists(pk) and os.path.exists(pub): - choice = input("You already have a wireguard key-pair already, do you want to re-generate? [y/n] ") - if choice == 'y' or choice == 'Y': - generate_keypair() + try: + choice = input("You already have a wireguard key-pair already, do you want to re-generate? [y/n] ") + if choice == 'y' or choice == 'Y': + generate_keypair() + except KeyboardInterrupt: + sys.exit(0) else: if not os.path.exists(dir): os.mkdir(dir) diff --git a/src/system/post-upgrade b/src/system/post-upgrade new file mode 100755 index 000000000..41b7c01ba --- /dev/null +++ b/src/system/post-upgrade @@ -0,0 +1,3 @@ +#!/bin/sh + +chown -R root:vyattacfg /config |