global: Remove default service/*/service_extra_groups=$SET:default_internal_group

This is no longer necessary now that mail_access_groups sets it.

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index 974bd4bf2f96484d339236098637f06e82cf9eb9..690f999b81d869a0870dbebf48df3054c0d11d83 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -47,7 +47,9 @@ const struct setting_keyvalue doveadm_service_settings_defaults[] = {
        { "unix_listener/doveadm-server/type", "tcp" },
        { "unix_listener/doveadm-server/mode", "0600" },
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };

diff --git a/src/imap-urlauth/imap-urlauth-worker-settings.c b/src/imap-urlauth/imap-urlauth-worker-settings.c
index c5e3129dc085d8bfaf220ca7b9e3cd18a51882f8..0a8e6bd3178da23a62fb868e880f2ca3c9ec200d 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker-settings.c
+++ b/src/imap-urlauth/imap-urlauth-worker-settings.c
@@ -39,7 +39,9 @@ const struct setting_keyvalue imap_urlauth_worker_service_settings_defaults[] =
        { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/mode", "0600" },
        { "unix_listener/"IMAP_URLAUTH_WORKER_SOCKET"/user", "$SET:default_internal_user" },
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index 6a07a1ab1abeb7c2c09773ade5f9e4e67a4036b5..9826727ae2bee82d43d16fb46ae1b765d7ccaba7 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -59,7 +59,9 @@ const struct setting_keyvalue imap_service_settings_defaults[] = {
        { "unix_listener/srv.imap\\s%{pid}/type", "admin" },
        { "unix_listener/srv.imap\\s%{pid}/mode", "0600" },
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };

diff --git a/src/indexer/indexer-worker-settings.c b/src/indexer/indexer-worker-settings.c
index c78b083ca77c6a8b2b74c12c768ea92ee0839fa3..0e99a407561867ab3124df8fa883dd91221a61a5 100644 (file)
--- a/src/indexer/indexer-worker-settings.c
+++ b/src/indexer/indexer-worker-settings.c
@@ -36,7 +36,9 @@ const struct setting_keyvalue indexer_worker_service_settings_defaults[] = {
        { "unix_listener/srv.indexer-worker\\s%{pid}/type", "admin" },
        { "unix_listener/srv.indexer-worker\\s%{pid}/mode", "0600" },
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };

diff --git a/src/lib-settings/settings-history-core.txt b/src/lib-settings/settings-history-core.txt
index eb30e8c3d8cbf7348eda12b89de92ff2fac37537..b5113742e97bbc5a41ed9141eb1f3e5c63d3cb26 100644 (file)
--- a/src/lib-settings/settings-history-core.txt
+++ b/src/lib-settings/settings-history-core.txt
@@ -1,3 +1,10 @@
+default        service/doveadm/service_extra_groups    $SET:default_internal_group     2.4.3   3.2.0
+default        service/imap/service_extra_groups       $SET:default_internal_group     2.4.3   3.2.0
+default        service/imap-urlauth-worker/service_extra_groups        $SET:default_internal_group     2.4.3   3.2.0
+default        service/indexer-worker/service_extra_groups     $SET:default_internal_group     2.4.3   3.2.0
+default        service/lmtp/service_extra_groups       $SET:default_internal_group     2.4.3   3.2.0
+default        service/pop3/service_extra_groups       $SET:default_internal_group     2.4.3   3.2.0
+default        service/submission/service_extra_groups $SET:default_internal_group     2.4.3   3.2.0
 default        mail_access_groups              2.4.3   3.2.0
 default        mail_attachment_detection_options               2.4.2   3.2.0
 default        @metric_defaults/proxy/metric   auth_successes,auth_failures,login_aborted      2.4.2   3.2.0

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index 1d449c0ee56e35281d5807821fad16dc36754548..12250a6d1fb4444f558344bb1f3a81bd997d22fb 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -51,7 +51,9 @@ const struct setting_keyvalue lmtp_service_settings_defaults[] = {
        { "inet_listener/lmtp/port", "24" },
 #endif
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };

diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index 3dc5f09fda7e675b9418ae44d7e55d0e1f08613d..b484f68070772ad09c5f6d0e266bf14e4ea260d1 100644 (file)
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -49,7 +49,9 @@ const struct setting_keyvalue pop3_service_settings_defaults[] = {
        { "unix_listener/srv.pop3\\s%{pid}/type", "admin" },
        { "unix_listener/srv.pop3\\s%{pid}/mode", "0600" },
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };

diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index 6f3d979a596df242d62f61236a78f58cb186afb6..8a6485f426aa604e5d7c188ea321de8bb7d3f01d 100644 (file)
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -49,7 +49,9 @@ const struct setting_keyvalue submission_service_settings_defaults[] = {
        { "unix_listener/srv.submission\\s%{pid}/type", "admin" },
        { "unix_listener/srv.submission\\s%{pid}/mode", "0600" },
 
-       { "service_extra_groups", "$SET:default_internal_group" },
+       /* This needs to be here explicitly until the backwards compatibility
+          is removed from settings-history-core.txt */
+       { "service_extra_groups", "" },
 
        { NULL, NULL }
 };