From 2d2bfeeb7ed57e43847aa272a3c0f046176101e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adrian=20M=C3=BCller?= Date: Mon, 2 Mar 2026 10:07:15 +0100 Subject: [PATCH] Add VPNCONN_REMOTE_MODECONFIG_MODE to vpnconn default cnfvars This cnfvar will be required for vpn connections in upcomping versions of the Intra2net system. On the side: remove unused imports from touched file. --- src/cnfvar/templates.py | 4 ++-- test/cnfvar/cnfs.cnf | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cnfvar/templates.py b/src/cnfvar/templates.py index 0bad943..5154a03 100644 --- a/src/cnfvar/templates.py +++ b/src/cnfvar/templates.py @@ -27,11 +27,10 @@ These templates contain the bare defaults the UI adds upon creation of each major and frequently used cnfvar. """ -import time import logging # custom imports -from .model import Cnf, CnfList +from .model import Cnf log = logging.getLogger('pyi2ncommon.cnfvar.templates') @@ -190,6 +189,7 @@ vpnconn_defaults = { "VPNCONN_PSK_OWN_ID_TYPE": "IP", "VPNCONN_REMOTE_INET_NAT": "1", "VPNCONN_REMOTE_MODECONFIG_IP": "", + "VPNCONN_REMOTE_MODECONFIG_MODE": "PULL", "VPNCONN_REMOTE_NAT_ENABLE": "0", "VPNCONN_REMOTE_NAT_NETWORK": "", "VPNCONN_REMOTE_NET": "", diff --git a/test/cnfvar/cnfs.cnf b/test/cnfvar/cnfs.cnf index 0b5e70c..d52da21 100644 --- a/test/cnfvar/cnfs.cnf +++ b/test/cnfvar/cnfs.cnf @@ -1254,6 +1254,7 @@ 1254 VPN_DEFAULT_KEY_FOREIGN_CREATE_DAYS,0: "1825" 1255 VPN_DEFAULT_KEY_OWN_REF,0: "1" 1256 VPN_DEFAULT_MODECONFIG_BASE_IP,0: "192.168.40.1" +1356 VPN_DEFAULT_MODECONFIG_BASE_MODE,0: "PULL" 1257 VPN_DEFAULT_PROXY_PROFILE_REF,0: "-1" 1258 VPN_ENCRYPTION_PROFILE,0: "Standard (mit PFS)" 1259 (1258) VPN_ENCRYPTION_PROFILE_IKE,0: "" -- 1.7.1