From: Plamen Dimitrov Date: Thu, 12 May 2022 05:01:01 +0000 (+0300) Subject: Use better and fresh/recent UI defaults for all templates X-Git-Tag: v1.7.1~3^2~6^2~5 X-Git-Url: http://developer.intra2net.com/git/?p=pyi2ncommon;a=commitdiff_plain;h=4fef584fc03a5ee1bb9cc1c7c47966f527afbe93 Use better and fresh/recent UI defaults for all templates In particular, German locale for user cnfvars is a better choice considering our current customer base and some values were not actual or at least recent UI defaults before the migration. --- diff --git a/src/cnfvar/templates.py b/src/cnfvar/templates.py index d2ae7cb..a0b2e89 100644 --- a/src/cnfvar/templates.py +++ b/src/cnfvar/templates.py @@ -57,13 +57,13 @@ log = logging.getLogger('pyi2ncommon.cnfvar.templates') user_defaults = { "USER_DISABLED": "0", "USER_FULLNAME": "", - "USER_GROUPWARE_FOLDER_CALENDAR": "INBOX/Calendar", - "USER_GROUPWARE_FOLDER_CONTACTS": "INBOX/Contacts", - "USER_GROUPWARE_FOLDER_DRAFTS": "INBOX/Drafts", - "USER_GROUPWARE_FOLDER_NOTES": "INBOX/Notes", - "USER_GROUPWARE_FOLDER_OUTBOX": "INBOX/Sent Items", - "USER_GROUPWARE_FOLDER_TASKS": "INBOX/Tasks", - "USER_GROUPWARE_FOLDER_TRASH": "INBOX/Deleted Items", + "USER_GROUPWARE_FOLDER_CALENDAR": "INBOX/Kalender", + "USER_GROUPWARE_FOLDER_CONTACTS": "INBOX/Kontakte", + "USER_GROUPWARE_FOLDER_DRAFTS": "INBOX/Entwürfe", + "USER_GROUPWARE_FOLDER_NOTES": "INBOX/Notizen", + "USER_GROUPWARE_FOLDER_OUTBOX": "INBOX/Gesendete Elemente", + "USER_GROUPWARE_FOLDER_TASKS": "INBOX/Aufgaben", + "USER_GROUPWARE_FOLDER_TRASH": "INBOX/Gelöschte Elemente", # always a member of the 'Alle' group "USER_GROUP_MEMBER_REF": "2", "USER_LOCALE": "", @@ -94,15 +94,8 @@ intraclient_defaults = { nic_defaults = { "NIC_COMMENT": "", "NIC_DRIVER": "virtio_net", - "NIC_LAN_DNS_RELAYING_ALLOWED": "0", - "NIC_LAN_EMAIL_RELAYING_ALLOWED": "0", - "NIC_LAN_FIREWALL_RULESET_REF": "1", - "NIC_LAN_IP": "192.168.1.1", - "NIC_LAN_NAT_INTO": "0", - "NIC_LAN_NETMASK": "255.255.255.0", - "NIC_LAN_PROXY_PROFILE_REF": "-1", "NIC_MAC": "02:00:00:00:20:00", - "NIC_TYPE": "DSLROUTER", + "NIC_TYPE": "UNUSED", } #: UI defaults for a provider instance provider_defaults = { @@ -123,7 +116,7 @@ provider_defaults = { "PROVIDER_EMAIL_RELAY_REF": "-1", "PROVIDER_DYNDNS_WEBCHECKIP": "0", "PROVIDER_DYNDNS_ENABLE": "1", - "PROVIDER_DNS_MODE": "IP", + "PROVIDER_DNS_MODE": "ROOT", "PROVIDER_DNS": "", "PROVIDER_BWIDTH_MANAGEMENT_UPSTREAM_SPEED": "", "PROVIDER_BWIDTH_MANAGEMENT_ENABLE": "0",