From: janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 3 Jun 2008 12:14:16 +0000 (+0000)
Subject: New config variable 'new-systems-ou', default is 'ou=systems'.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5c14e489c3ddb78ca196fa1dad808cabaec2144a;p=gosa.git

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 94f8c6098..cbf152842 100755
--- 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 0294fb325..11bd7417c 100644
--- 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(