- Updated opensuse instructions.

- The home directory of a shell user gets deleted when the user is deleted.

Author: tbrehm

docs/INSTALL_OPENSUSE_11_1.txt

@@ -12,7 +12,7 @@ The following guide is for the 32Bit version of openSUSE, for 64Bit installation
 
 Install some basic packes and the compilers that we need later
 
-yast2 -i findutils readline libgcc glibc-devel findutils-locate gcc flex lynx compat-readline4 db-devel wget gcc-c++ make vim telnet cron iptables iputils man man-pages
+yast2 -i findutils readline libgcc glibc-devel findutils-locate gcc flex lynx compat-readline4 db-devel wget gcc-c++ make vim telnet cron iptables iputils man man-pages nano pico
 
 1) Istall Postfix, Courier, Saslauthd, MySQL, phpMyAdmin with the following command line (on one line!):
 

install/dist/conf/opensuse110.conf.php

@@ -145,7 +145,7 @@
 $conf['jailkit']['config_dir'] = '/etc/jailkit';
 $conf['jailkit']['jk_init'] = 'jk_init.ini';
 $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
-$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
+$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
 
 
 ?>

server/plugins-available/shelluser_base_plugin.inc.php

@@ -148,7 +148,7 @@ function delete($event_name,$data) {
 			// Get the UID of the user
 			$userid = intval($app->system->getuid($data['old']['username']));
 			if($userid > $this->min_uid) {
-				$command = 'userdel --force';
+				$command = 'userdel -f -r';
 				$command .= ' '.escapeshellcmd($data['old']['username']);
 
 				exec($command);

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -151,8 +151,12 @@ function delete($event_name,$data) {
 			//commented out proved to be dangerous on config errors
 			//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
 
-			
-			$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
+			if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
+				$command = 'userdel -f -r';
+				$command .= ' '.escapeshellcmd($data['old']['username']);
+				exec($command);
+				$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
+			}
 		}
 
 		$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);