force update jails on cron/shell_user update

Author: jnorell

server/plugins-available/cron_jailkit_plugin.inc.php

@@ -275,8 +275,13 @@ function _setup_jailkit_chroot()
 					unset($options['allow_hardlink']);
 				}
 			}
+			// force update existing jails
+			$options[] = 'force';
 
-			$app->system->update_jailkit_chroot($this->data['new']['dir'], $options);
+			$sections = $this->jailkit_config['jailkit_chroot_app_sections'];
+			$programs = $this->jailkit_config['jailkit_chroot_app_programs'];
+
+			$app->system->update_jailkit_chroot($this->data['new']['dir'], $sections, $programs, $options);
 		}
 		$this->_add_jailkit_programs();
 
@@ -288,11 +293,13 @@ function _add_jailkit_programs()
 	{
 		global $app;
 
+		$opts = array('force');
+
 		//copy over further programs and its libraries
-		$app->system->create_jailkit_programs($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_app_programs']);
+		$app->system->create_jailkit_programs($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_app_programs'], $opts);
 		$this->app->log("Added app programs to jailkit chroot", LOGLEVEL_DEBUG);
 
-		$app->system->create_jailkit_programs($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_cron_programs']);
+		$app->system->create_jailkit_programs($this->parent_domain['document_root'], $this->jailkit_config['jailkit_chroot_cron_programs'], $opts);
 		$this->app->log("Added cron programs to jailkit chroot", LOGLEVEL_DEBUG);
 	}
 

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -284,7 +284,6 @@ function delete($event_name, $data) {
 
 		$app->log("Jailkit Plugin -> delete username:".$data['old']['username'], LOGLEVEL_DEBUG);
 
-
 	}
 
 	function _setup_jailkit_chroot()
@@ -339,8 +338,13 @@ function _setup_jailkit_chroot()
 					unset($options['allow_hardlink']);
 				}
 			}
+			// force update existing jails
+			$options[] = 'force';
+
+			$sections = $this->jailkit_config['jailkit_chroot_app_sections'];
+			$programs = $this->jailkit_config['jailkit_chroot_app_programs'];
 
-			$app->system->update_jailkit_chroot($this->data['new']['dir'], $options);
+			$app->system->update_jailkit_chroot($this->data['new']['dir'], $sections, $programs, $options);
 		}
 
 		// might need to update master db here?  checking....