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 33672995a3551f40b9b7f18533eb586c7726e237..5412238b3979a6db182cc595f66bd8919f755b19 100644 (file)
--- 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 763e43a2b7019df949191dddf9ed38d2517d409e..819c9b2d33682299c5978b3ee825c7a155a64424 100644 (file)
--- 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 8155a9ccb9e83b84df0dbbfd52644e409e8cebd2..54dce2284f2ccc00995b881b8719783947fa4a81 100644 (file)
--- 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 763e43a2b7019df949191dddf9ed38d2517d409e..663087bb58fddb6b042bb6008a07d2bf7ddee0cc 100644 (file)
--- 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 8155a9ccb9e83b84df0dbbfd52644e409e8cebd2..0c3f9c9ee9660ad5b9e671f63caaad8447b6d0d8 100644 (file)
--- 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 763e43a2b7019df949191dddf9ed38d2517d409e..ce2703b667ead7c4b360b39534cc9771c71c37a1 100644 (file)
--- 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 8155a9ccb9e83b84df0dbbfd52644e409e8cebd2..955c320ab109607db2dc9d9a5b970ac8505d982f 100644 (file)
--- 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 (file)
index 0000000..7ca56e9
--- /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 (file)
index 7ca56e9..0000000
--- 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 (file)
index 0000000..0c65e2c
--- /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 (file)
index 0c65e2c..0000000
--- 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 (file)
index 0000000..8a07a63
--- /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 (file)
index 8a07a63..0000000
--- 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                   
-