From: cajus Date: Wed, 12 Dec 2007 14:45:44 +0000 (+0000) Subject: Updated si stuff X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d70ed244ef285c0f6afbd1fbd95f432110c6c941;p=gosa.git Updated si stuff git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8108 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-si/debian/changelog b/gosa-si/debian/changelog index 33672995a..5412238b3 100644 --- a/gosa-si/debian/changelog +++ b/gosa-si/debian/changelog @@ -1,4 +1,4 @@ -gosa-sd (1.0-1) unstable; urgency=low +gosa-si (1.0-1) unstable; urgency=low * Initial release diff --git a/gosa-si/debian/gosa-si-client.dirs b/gosa-si/debian/gosa-si-client.dirs index 763e43a2b..819c9b2d3 100644 --- a/gosa-si/debian/gosa-si-client.dirs +++ b/gosa-si/debian/gosa-si-client.dirs @@ -1,4 +1,2 @@ -usr/share/ltsp/plugins/ltsp-build-client/common -usr/share/ltsp/scripts +etc/gosa usr/sbin -etc/default diff --git a/gosa-si/debian/gosa-si-client.install b/gosa-si/debian/gosa-si-client.install index 8155a9ccb..54dce2284 100644 --- a/gosa-si/debian/gosa-si-client.install +++ b/gosa-si/debian/gosa-si-client.install @@ -1,12 +1,2 @@ -debian/goto etc/default -build-goto-client usr/sbin -plugins/001-ltsp-addon-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/020-ssh-pubkey-login usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-goto-ldap-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-sane-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/020-nx-client usr/share/ltsp/plugins/ltsp-build-client/common -plugins/010-goto-ldap-files usr/share/ltsp/plugins/ltsp-build-client/common -plugins/999-goto-ldap-final usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-snmp-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/030-late-packages-goto usr/share/ltsp/plugins/ltsp-build-client/common -plugins/000-goto-ldap-vars usr/share/ltsp/plugins/ltsp-build-client/common +gosa-si-client usr/sbin +gosa-si-client.conf-template etc/gosa/gosa-si-client.conf diff --git a/gosa-si/debian/gosa-si-common.dirs b/gosa-si/debian/gosa-si-common.dirs index 763e43a2b..663087bb5 100644 --- a/gosa-si/debian/gosa-si-common.dirs +++ b/gosa-si/debian/gosa-si-common.dirs @@ -1,4 +1,2 @@ -usr/share/ltsp/plugins/ltsp-build-client/common -usr/share/ltsp/scripts -usr/sbin etc/default +/usr/share/perl5/GOSA diff --git a/gosa-si/debian/gosa-si-common.install b/gosa-si/debian/gosa-si-common.install index 8155a9ccb..0c3f9c9ee 100644 --- a/gosa-si/debian/gosa-si-common.install +++ b/gosa-si/debian/gosa-si-common.install @@ -1,12 +1,2 @@ -debian/goto etc/default -build-goto-client usr/sbin -plugins/001-ltsp-addon-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/020-ssh-pubkey-login usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-goto-ldap-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-sane-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/020-nx-client usr/share/ltsp/plugins/ltsp-build-client/common -plugins/010-goto-ldap-files usr/share/ltsp/plugins/ltsp-build-client/common -plugins/999-goto-ldap-final usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-snmp-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/030-late-packages-goto usr/share/ltsp/plugins/ltsp-build-client/common -plugins/000-goto-ldap-vars usr/share/ltsp/plugins/ltsp-build-client/common +modules/GosaPackages.pm usr/share/perl5/GOSA/GosaPackages.pm +debian/default etc/default diff --git a/gosa-si/debian/gosa-si-server.dirs b/gosa-si/debian/gosa-si-server.dirs index 763e43a2b..ce2703b66 100644 --- a/gosa-si/debian/gosa-si-server.dirs +++ b/gosa-si/debian/gosa-si-server.dirs @@ -1,4 +1,2 @@ -usr/share/ltsp/plugins/ltsp-build-client/common -usr/share/ltsp/scripts usr/sbin -etc/default +etc/gosa diff --git a/gosa-si/debian/gosa-si-server.install b/gosa-si/debian/gosa-si-server.install index 8155a9ccb..955c320ab 100644 --- a/gosa-si/debian/gosa-si-server.install +++ b/gosa-si/debian/gosa-si-server.install @@ -1,12 +1,5 @@ -debian/goto etc/default -build-goto-client usr/sbin -plugins/001-ltsp-addon-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/020-ssh-pubkey-login usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-goto-ldap-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-sane-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/020-nx-client usr/share/ltsp/plugins/ltsp-build-client/common -plugins/010-goto-ldap-files usr/share/ltsp/plugins/ltsp-build-client/common -plugins/999-goto-ldap-final usr/share/ltsp/plugins/ltsp-build-client/common -plugins/001-snmp-packages usr/share/ltsp/plugins/ltsp-build-client/common -plugins/030-late-packages-goto usr/share/ltsp/plugins/ltsp-build-client/common -plugins/000-goto-ldap-vars usr/share/ltsp/plugins/ltsp-build-client/common +gosa-si-server usr/sbin +gosa-si-bus usr/sbin +gosa-si-server.conf-template etc/gosa +gosa-si-bus.conf-template etc/gosa +modules/ServerPackages.pm usr/share/perl5/GOSA/ServerPackages.pm diff --git a/gosa-si/gosa-si-bus.conf b/gosa-si/gosa-si-bus.conf new file mode 100644 index 000000000..7ca56e906 --- /dev/null +++ b/gosa-si/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/gosa-si-bus.conf-template b/gosa-si/gosa-si-bus.conf-template deleted file mode 100644 index 7ca56e906..000000000 --- a/gosa-si/gosa-si-bus.conf-template +++ /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.conf b/gosa-si/gosa-si-client.conf new file mode 100644 index 000000000..0c65e2cad --- /dev/null +++ b/gosa-si/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/gosa-si-client.conf-template b/gosa-si/gosa-si-client.conf-template deleted file mode 100644 index 0c65e2cad..000000000 --- a/gosa-si/gosa-si-client.conf-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/gosa-si/gosa-si-server.conf b/gosa-si/gosa-si-server.conf new file mode 100644 index 000000000..8a07a631b --- /dev/null +++ b/gosa-si/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 + diff --git a/gosa-si/gosa-si-server.conf-template b/gosa-si/gosa-si-server.conf-template deleted file mode 100644 index 8a07a631b..000000000 --- a/gosa-si/gosa-si-server.conf-template +++ /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 -