Merge branch '6124-jailkit-cron-set-group-on-home-dir' into 'develop'

Marius Burkard · Marius Burkard · commit ffce44e7d905 · 2021-03-25T16:23:02.000Z
Resolve "jailkit cron: set group on home dir"

Closes #6124

See merge request ispconfig/ispconfig3!1460
diff --git a/server/plugins-available/cron_jailkit_plugin.inc.php b/server/plugins-available/cron_jailkit_plugin.inc.php
@@ -339,10 +339,11 @@ function _add_jailkit_user()
 
 		if(!is_dir($this->parent_domain['document_root'].$jailkit_chroot_userhome)) {
 			$app->system->mkdir($this->parent_domain['document_root'].$jailkit_chroot_userhome, 0750, true);
-			$app->system->chown($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_user']);
-			$app->system->chgrp($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_group']);
 		}
 
+		$app->system->chown($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_user']);
+		$app->system->chgrp($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_group']);
+
 	}
 
 	function _get_home_dir($username)

Original file line number	Diff line number	Diff line change
`@@ -339,10 +339,11 @@ function _add_jailkit_user()`
`339`	`339`
`340`	`340`	`if(!is_dir($this->parent_domain['document_root'].$jailkit_chroot_userhome)) {`
`341`	`341`	`$app->system->mkdir($this->parent_domain['document_root'].$jailkit_chroot_userhome, 0750, true);`
`342`		`- $app->system->chown($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_user']);`
`343`		`- $app->system->chgrp($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_group']);`
`344`	`342`	`}`
`345`	`343`
	`344`	`+ $app->system->chown($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_user']);`
	`345`	`+ $app->system->chgrp($this->parent_domain['document_root'].$jailkit_chroot_userhome, $this->parent_domain['system_group']);`
	`346`	`+`
`346`	`347`	`}`
`347`	`348`
`348`	`349`	`function _get_home_dir($username)`