From: cajus Date: Wed, 12 Dec 2007 15:26:50 +0000 (+0000) Subject: Updated naming policy X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=70eeb46ece63ef02eb685452055195bba6a5a818;p=gosa.git 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 index 000000000..7ca56e906 --- /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 index 000000000..0c65e2cad --- /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 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-bus.conf b/gosa-si/gosa-si-bus.conf deleted file mode 100644 index 7ca56e906..000000000 --- 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 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-client.conf b/gosa-si/gosa-si-client.conf deleted file mode 100644 index 0c65e2cad..000000000 --- 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 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/gosa-si-server.conf deleted file mode 100644 index 8a07a631b..000000000 --- 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 index 000000000..8a07a631b --- /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 +