Updated naming policy

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

diff --git a/gosa-si/bus.conf b/gosa-si/bus.conf
new file mode 100644 (file)
index 0000000..7ca56e9
--- /dev/null
+++ b/gosa-si/bus.conf
@@ -0,0 +1,13 @@
+[general]
+log_file = /var/log/gosa-si-bus.log
+pid_file = /var/run/gosa-si-bus.pid
+child_max = 10
+child_min = 2
+child_timeout = 10
+
+[bus]
+bus_activ = on
+bus_passwd = secret-bus-password
+bus_ip = 127.0.0.1
+bus_port = 20080
+

diff --git a/gosa-si/client.conf b/gosa-si/client.conf
new file mode 100644 (file)
index 0000000..0c65e2c
--- /dev/null
+++ b/gosa-si/client.conf
@@ -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/gosa-si/debian/gosa-si-client.dirs b/gosa-si/debian/gosa-si-client.dirs
index 819c9b2d33682299c5978b3ee825c7a155a64424..fc22b1cec7ab9cfb443d3168ac71fd1840cf6922 100644 (file)
--- 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 153697f17af21a5f9b0b0c4628d4da3f3d01c4da..e5544c641ccd9302fac5ae9f7b5fc7bbfde1f013 100644 (file)
--- 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 ce2703b667ead7c4b360b39534cc9771c71c37a1..08f1b093872f7fa5957c013d065a595c2e4682b5 100644 (file)
--- 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 a13df20b739bea575194cdb33d89db9f30c6e7e7..52992a51e9c2b2e4a53e0941af57ba6386b4e312 100644 (file)
--- 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 a56a38e1a2f9a46763ab00bc46aa29040cb0fffd..09581e67795d309aea6568ddeebcfb56f6fdc12a 100755 (executable)
--- 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-bus.conf b/gosa-si/gosa-si-bus.conf
deleted file mode 100644 (file)
index 7ca56e9..0000000
--- a/gosa-si/gosa-si-bus.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-log_file = /var/log/gosa-si-bus.log
-pid_file = /var/run/gosa-si-bus.pid
-child_max = 10
-child_min = 2
-child_timeout = 10
-
-[bus]
-bus_activ = on
-bus_passwd = secret-bus-password
-bus_ip = 127.0.0.1
-bus_port = 20080
-

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 3825940a7c6235ae4a5fb9b163f62f1ecccebf45..2dcb06781158df8d709996064b75af6138016373 100755 (executable)
--- 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-client.conf b/gosa-si/gosa-si-client.conf
deleted file mode 100644 (file)
index 0c65e2c..0000000
--- a/gosa-si/gosa-si-client.conf
+++ /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/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 096637417cbe0fdcff0b7a6889a0a89dd060932e..95027948969a7f1ac28b98b6d8796433d8ffa266 100755 (executable)
--- 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/gosa-si-server.conf
deleted file mode 100644 (file)
index 8a07a63..0000000
--- a/gosa-si/gosa-si-server.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[general]
-log_file = /var/log/gosa-si-daemon.log
-pid_file = /var/run/gosa-si-daemon.pid
-child_max = 10
-child_min = 2
-child_timeout = 10
-
-[bus]
-bus_activ = on
-bus_passwd = secret-bus-password
-bus_ip = 127.0.0.1
-bus_port = 20080
-
-[server]
-server_activ = on
-server_port = 20081
-server_passwd = secret-server-password
-max_clients = 5
-
-[arp]
-arp_activ = off
-arp_fifo_path = /var/run/gosa-si/arp-notify
-
-[gosa]
-gosa_activ = on
-gosa_ip = 127.0.0.1
-gosa_port = 20082
-gosa_passwd = secret-gosa-password
-gosa_timeout = 5                   
-

diff --git a/gosa-si/server.conf b/gosa-si/server.conf
new file mode 100644 (file)
index 0000000..8a07a63
--- /dev/null
+++ b/gosa-si/server.conf
@@ -0,0 +1,30 @@
+[general]
+log_file = /var/log/gosa-si-daemon.log
+pid_file = /var/run/gosa-si-daemon.pid
+child_max = 10
+child_min = 2
+child_timeout = 10
+
+[bus]
+bus_activ = on
+bus_passwd = secret-bus-password
+bus_ip = 127.0.0.1
+bus_port = 20080
+
+[server]
+server_activ = on
+server_port = 20081
+server_passwd = secret-server-password
+max_clients = 5
+
+[arp]
+arp_activ = off
+arp_fifo_path = /var/run/gosa-si/arp-notify
+
+[gosa]
+gosa_activ = on
+gosa_ip = 127.0.0.1
+gosa_port = 20082
+gosa_passwd = secret-gosa-password
+gosa_timeout = 5                   
+