From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 11 Dec 2007 14:57:49 +0000 (+0000)
Subject: Rename part two
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4269b14adaecfe4244428df694db73882db98444;p=gosa.git

Rename part two


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

diff --git a/contrib/daemon/gosa-si-bus b/contrib/daemon/gosa-si-bus
index f231d19cb..a56a38e1a 100755
--- a/contrib/daemon/gosa-si-bus
+++ b/contrib/daemon/gosa-si-bus
@@ -136,7 +136,7 @@ sub check_cmdline_param () {
     my $err_counter = 0;
     if( not defined( $cfg_file)) {
         my $cwd = getcwd;
-        my $name = "gosa-sd-bus.cfg";
+        my $name = "/etc/gosa/gosa-si-bus.conf";
         $cfg_file = File::Spec->catfile( $cwd, $name );
         print STDERR "no conf file specified\n   try to use default: $cfg_file\n";
     }
diff --git a/contrib/daemon/gosa-si-client b/contrib/daemon/gosa-si-client
index c74ad7055..3825940a7 100755
--- a/contrib/daemon/gosa-si-client
+++ b/contrib/daemon/gosa-si-client
@@ -140,7 +140,7 @@ sub check_cmdline_param () {
         #$err_config = "please specify a config file";
         #$err_counter += 1;
         my $cwd = getcwd;
-        my $name = "gosa-sc.cfg";
+        my $name = "/etc/gosa/gosa-si-client.conf";
         $cfg_file = File::Spec->catfile( $cwd, $name );
         print STDERR "no conf file specified\n   try to use default: $cfg_file\n";        
     }
diff --git a/contrib/daemon/gosa-si-client.cfg-template b/contrib/daemon/gosa-si-client.cfg-template
deleted file mode 100644
index 0c65e2cad..000000000
--- a/contrib/daemon/gosa-si-client.cfg-template
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-log_file = /var/log/gosa-si-client.log
-pid_file = /var/run/gosa-si-client.pid
-
-[client]
-client_port = 20083
-
-[server]
-server_ip = 127.0.0.1
-server_port = 20081
-server_passwd = secret-server-password
-server_timeout = 5
-server_domain = intranet.gonicus.de
diff --git a/contrib/daemon/gosa-si-client.conf-template b/contrib/daemon/gosa-si-client.conf-template
new file mode 100644
index 000000000..0c65e2cad
--- /dev/null
+++ b/contrib/daemon/gosa-si-client.conf-template
@@ -0,0 +1,13 @@
+[general]
+log_file = /var/log/gosa-si-client.log
+pid_file = /var/run/gosa-si-client.pid
+
+[client]
+client_port = 20083
+
+[server]
+server_ip = 127.0.0.1
+server_port = 20081
+server_passwd = secret-server-password
+server_timeout = 5
+server_domain = intranet.gonicus.de
diff --git a/contrib/daemon/gosa-si-daemon b/contrib/daemon/gosa-si-daemon
index 6c933b3d8..096637417 100755
--- a/contrib/daemon/gosa-si-daemon
+++ b/contrib/daemon/gosa-si-daemon
@@ -224,7 +224,7 @@ sub check_cmdline_param () {
         #$err_config = "please specify a config file";
         #$err_counter += 1;
         my $cwd = getcwd;
-        my $name = "gosa-sd.cfg";
+        my $name = "/etc/gosa/gosa-si-server.conf";
         $cfg_file = File::Spec->catfile( $cwd, $name );
         print STDERR "no conf file specified\n   try to use default: $cfg_file\n";       
     }