From 70eeb46ece63ef02eb685452055195bba6a5a818 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 12 Dec 2007 15:26:50 +0000
Subject: [PATCH] Updated naming policy

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8113 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-si/{gosa-si-bus.conf => bus.conf}       | 0
 gosa-si/{gosa-si-client.conf => client.conf} | 0
 gosa-si/debian/gosa-si-client.dirs           | 2 +-
 gosa-si/debian/gosa-si-client.install        | 2 +-
 gosa-si/debian/gosa-si-server.dirs           | 2 +-
 gosa-si/debian/gosa-si-server.install        | 4 ++--
 gosa-si/gosa-si-bus                          | 3 +--
 gosa-si/gosa-si-client                       | 2 +-
 gosa-si/gosa-si-server                       | 7 +++----
 gosa-si/{gosa-si-server.conf => server.conf} | 0
 10 files changed, 10 insertions(+), 12 deletions(-)
 rename gosa-si/{gosa-si-bus.conf => bus.conf} (100%)
 rename gosa-si/{gosa-si-client.conf => client.conf} (100%)
 rename gosa-si/{gosa-si-server.conf => server.conf} (100%)

diff --git a/gosa-si/gosa-si-bus.conf b/gosa-si/bus.conf
similarity index 100%
rename from gosa-si/gosa-si-bus.conf
rename to gosa-si/bus.conf
diff --git a/gosa-si/gosa-si-client.conf b/gosa-si/client.conf
similarity index 100%
rename from gosa-si/gosa-si-client.conf
rename to gosa-si/client.conf
diff --git a/gosa-si/debian/gosa-si-client.dirs b/gosa-si/debian/gosa-si-client.dirs
index 819c9b2d3..fc22b1cec 100644
--- a/gosa-si/debian/gosa-si-client.dirs
+++ b/gosa-si/debian/gosa-si-client.dirs
@@ -1,2 +1,2 @@
-etc/gosa
+etc/gosa-si
 usr/sbin
diff --git a/gosa-si/debian/gosa-si-client.install b/gosa-si/debian/gosa-si-client.install
index 153697f17..e5544c641 100644
--- a/gosa-si/debian/gosa-si-client.install
+++ b/gosa-si/debian/gosa-si-client.install
@@ -1,2 +1,2 @@
 gosa-si-client		usr/sbin
-gosa-si-client.conf	etc/gosa
+client.conf		etc/gosa-si
diff --git a/gosa-si/debian/gosa-si-server.dirs b/gosa-si/debian/gosa-si-server.dirs
index ce2703b66..08f1b0938 100644
--- a/gosa-si/debian/gosa-si-server.dirs
+++ b/gosa-si/debian/gosa-si-server.dirs
@@ -1,2 +1,2 @@
 usr/sbin
-etc/gosa
+etc/gosa-si
diff --git a/gosa-si/debian/gosa-si-server.install b/gosa-si/debian/gosa-si-server.install
index a13df20b7..52992a51e 100644
--- a/gosa-si/debian/gosa-si-server.install
+++ b/gosa-si/debian/gosa-si-server.install
@@ -1,5 +1,5 @@
 gosa-si-server			usr/sbin
 gosa-si-bus			usr/sbin
-gosa-si-server.conf		etc/gosa
-gosa-si-bus.conf		etc/gosa
+server.conf			etc/gosa-si
+bus.conf			etc/gosa-si
 modules/ServerPackages.pm       usr/share/perl5/GOSA
diff --git a/gosa-si/gosa-si-bus b/gosa-si/gosa-si-bus
index a56a38e1a..09581e677 100755
--- a/gosa-si/gosa-si-bus
+++ b/gosa-si/gosa-si-bus
@@ -136,9 +136,8 @@ sub check_cmdline_param () {
     my $err_counter = 0;
     if( not defined( $cfg_file)) {
         my $cwd = getcwd;
-        my $name = "/etc/gosa/gosa-si-bus.conf";
+        my $name = "/etc/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";
     }
     if( $err_counter > 0 ) {
         &usage( "", 1 );
diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 3825940a7..2dcb06781 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/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 = "/etc/gosa/gosa-si-client.conf";
+        my $name = "/etc/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/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 096637417..950279489 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -39,8 +39,8 @@ use File::Spec;
 use IPC::Shareable qw( :lock);
 IPC::Shareable->clean_up_all;
 
-use lib "/etc/gosad/modules";
-my $modules_path = "/etc/gosad/modules";
+use lib "/etc/gosa-si/modules";
+my $modules_path = "/etc/gosa-si/modules";
 
 my ($cfg_file, %cfg_defaults, $foreground, $verbose, $ping_timeout, $no_bus);
 my ($bus, $msg_to_bus, $bus_cipher);
@@ -224,9 +224,8 @@ sub check_cmdline_param () {
         #$err_config = "please specify a config file";
         #$err_counter += 1;
         my $cwd = getcwd;
-        my $name = "/etc/gosa/gosa-si-server.conf";
+        my $name = "/etc/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";       
     }
     if( $err_counter > 0 ) {
         &usage( "", 1 );
diff --git a/gosa-si/gosa-si-server.conf b/gosa-si/server.conf
similarity index 100%
rename from gosa-si/gosa-si-server.conf
rename to gosa-si/server.conf
-- 
2.30.2