Merge branch '6089-update-php-removes-_rspamd-from-redis-group' into 'develop'

Marius Burkard · Marius Burkard · commit 60c680faffd5 · 2021-03-09T14:52:21.000Z
Resolve "update.php removes _rspamd from redis group"

Closes #6089

See merge request ispconfig/ispconfig3!1427
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1793,9 +1793,9 @@ public function configure_rspamd() {
 		}
 
 		if(is_user('_rspamd') && is_group('amavis')) {
-			exec("usermod -G amavis _rspamd");
+			exec("usermod -a -G amavis _rspamd");
 		} elseif(is_user('rspamd') && is_group('amavis')) {
-			exec("usermod -G amavis rspamd");
+			exec("usermod -a -G amavis rspamd");
 		}
 
 		if(!is_dir('/etc/rspamd/local.d/')){

Original file line number	Diff line number	Diff line change
`@@ -1793,9 +1793,9 @@ public function configure_rspamd() {`
`1793`	`1793`	`}`
`1794`	`1794`
`1795`	`1795`	`if(is_user('_rspamd') && is_group('amavis')) {`
`1796`		`- exec("usermod -G amavis _rspamd");`
	`1796`	`+ exec("usermod -a -G amavis _rspamd");`
`1797`	`1797`	`} elseif(is_user('rspamd') && is_group('amavis')) {`
`1798`		`- exec("usermod -G amavis rspamd");`
	`1798`	`+ exec("usermod -a -G amavis rspamd");`
`1799`	`1799`	`}`
`1800`	`1800`
`1801`	`1801`	`if(!is_dir('/etc/rspamd/local.d/')){`