New config variable 'new-systems-ou', default is 'ou=systems'.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11171 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 94f8c6098dd433bf8e57075aa987bd4f89382bf8..cbf152842b36b94f2682386e6bef3f50c83b9602 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -101,6 +101,8 @@ our $forground;
 our $cfg_file;
 our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn);
 
+# Where should new systems be placed
+our $new_systems_ou;
 
 # specifies the verbosity of the daemon_log
 $verbose = 0 ;
@@ -241,6 +243,7 @@ my $max_children = 2;
     "job-queue-loop-delay" => [\$job_queue_loop_delay, 3],
     "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3],
     "key" => [\$GosaPackages_key, "none"],
+       "new-systems-ou" => [\$new_systems_ou, "ou=systems"],
     },
 "ClientPackages" => {
     "key" => [\$ClientPackages_key, "none"],

diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index 0294fb3258113869d35d3ee22ad0ff430370950e..11bd7417ce8e09de13dba97e468b25b0a452d4f3 100644 (file)
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -830,8 +830,8 @@ sub trigger_activate_new {
                                $base = $1 if $ogroup_entry->dn =~ /cn=$ogroup,ou=groups,(.*)$/;
                }
 
-               # prepend ou=systems
-               $base = "ou=systems,".$base;
+               # prepend ou=systems (configurable through config)
+               $base = $main::new_systems_ou.",".$base;
 
                # Search for an existing entry (should be in ou=incoming)
                $ldap_mesg= $ldap_handle->search(