Fixed some undefined index warnings if no FAI classes are available in workstation...

[gosa.git] / gosa-si / gosa-si-server

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 40f666d1a48dbfad2ba4cd7e854755765547b168..6d2c866d81e8a6128347383392f89760202761a3 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -101,6 +101,7 @@ our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_d
 # dak variables
 our $dak_base_directory;
 our $dak_signing_keys_directory;
+our $dak_queue_directory;
 our $dak_user;
 
 # specifies the verbosity of the daemon_log
@@ -238,7 +239,8 @@ my $max_children = 2;
     "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3],
     "key" => [\$GosaPackages_key, "none"],
        "dak-base" => [\$dak_base_directory, "/srv/archive"],
-       "dak-keyring" => [\$dak_signing_keys_directory, "/srv/archive/s3kr1t"],
+       "dak-keyring" => [\$dak_signing_keys_directory, "/srv/archive/keyrings"],
+       "dak-queue" => [\$dak_queue_directory, "/srv/archive/queue"],
        "dak-user" => [\$dak_user, "deb-dak"],
     },
 "ClientPackages" => {
@@ -1457,7 +1459,7 @@ sub session_start {
        $kernel->yield('create_fai_release_db', $fai_release_tn );
     $kernel->yield('watch_for_next_tasks');
        $kernel->sig(USR1 => "sig_handler");
-       $kernel->sig(USR2 => "create_packages_list_db");
+       $kernel->sig(USR2 => "recreate_packages_db");
        $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
        $kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); 
        $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
@@ -2000,6 +2002,16 @@ sub change_goto_state {
 }
 
 
+sub run_recreate_packages_db {
+    my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
+    my $session_id = $session->ID;
+       &main::daemon_log("$session_id INFO: Recreating FAI Packages DB ('$fai_release_tn', '$fai_server_tn', '$packages_list_tn')", 4);
+       $kernel->yield('create_fai_release_db');
+       $kernel->yield('create_fai_server_db');
+       return;
+}
+
+
 sub run_create_fai_server_db {
     my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0];
     my $session_id = $session->ID;
@@ -3028,6 +3040,7 @@ POE::Session->create(
         create_packages_list_db => \&run_create_packages_list_db,
         create_fai_server_db => \&run_create_fai_server_db,
         create_fai_release_db => \&run_create_fai_release_db,
+               recreate_packages_db => \&run_recreate_packages_db,
         session_run_result => \&session_run_result,
         session_run_debug => \&session_run_debug,
         session_run_done => \&session_run_done,