From e65fefebc29159e80d6ffc12471bd65805802529 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 11 Dec 2007 14:54:50 +0000
Subject: [PATCH] Renaming part one

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8084 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 contrib/daemon/gosa-sc.cfg-template         | 13 ---------
 contrib/daemon/gosa-sd-bus.cfg-template     | 13 ---------
 contrib/daemon/gosa-sd.cfg-template         | 30 ---------------------
 contrib/daemon/{gosa-sd-bus => gosa-si-bus} |  0
 contrib/daemon/gosa-si-bus.conf-template    | 13 +++++++++
 contrib/daemon/{gosa-sc => gosa-si-client}  |  0
 contrib/daemon/gosa-si-client.cfg-template  | 13 +++++++++
 contrib/daemon/{gosa-sd => gosa-si-daemon}  |  0
 contrib/daemon/gosa-si-daemon.conf-template | 30 +++++++++++++++++++++
 9 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100644 contrib/daemon/gosa-sc.cfg-template
 delete mode 100644 contrib/daemon/gosa-sd-bus.cfg-template
 delete mode 100644 contrib/daemon/gosa-sd.cfg-template
 rename contrib/daemon/{gosa-sd-bus => gosa-si-bus} (100%)
 create mode 100644 contrib/daemon/gosa-si-bus.conf-template
 rename contrib/daemon/{gosa-sc => gosa-si-client} (100%)
 create mode 100644 contrib/daemon/gosa-si-client.cfg-template
 rename contrib/daemon/{gosa-sd => gosa-si-daemon} (100%)
 create mode 100644 contrib/daemon/gosa-si-daemon.conf-template

diff --git a/contrib/daemon/gosa-sc.cfg-template b/contrib/daemon/gosa-sc.cfg-template
deleted file mode 100644
index acc488257..000000000
--- a/contrib/daemon/gosa-sc.cfg-template
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-log_file = /var/log/gosa-sc.log
-pid_file = /var/run/gosa-sc.pid
-
-[client]
-client_port = 10011
-
-[server]
-server_ip = 10.89.1.155
-server_port = 10001
-server_passwd = tester
-server_timeout = 5
-server_domain = intranet.gonicus.de
diff --git a/contrib/daemon/gosa-sd-bus.cfg-template b/contrib/daemon/gosa-sd-bus.cfg-template
deleted file mode 100644
index 04be5c82c..000000000
--- a/contrib/daemon/gosa-sd-bus.cfg-template
+++ /dev/null
@@ -1,13 +0,0 @@
-[general]
-log_file = /var/log/gosa-sd-bus.log
-pid_file = /var/run/gosa-sd-bus.pid
-child_max = 10
-child_min = 2
-child_timeout = 10
-
-[bus]
-bus_activ = on
-bus_passwd = hallali
-bus_ip = 10.89.1.155
-bus_port = 10000
-
diff --git a/contrib/daemon/gosa-sd.cfg-template b/contrib/daemon/gosa-sd.cfg-template
deleted file mode 100644
index 49eb75281..000000000
--- a/contrib/daemon/gosa-sd.cfg-template
+++ /dev/null
@@ -1,30 +0,0 @@
-[general]
-log_file = /var/log/gosa-sd.log
-pid_file = /var/run/gosa-sd.pid
-child_max = 10
-child_min = 2
-child_timeout = 10
-
-[bus]
-bus_activ = on
-bus_passwd = hallali
-bus_ip = 10.89.1.155
-bus_port = 10000
-
-[server]
-server_activ = on
-server_port = 10001
-server_passwd = tester
-max_clients = 5
-
-[arp]
-arp_activ = off
-arp_fifo_path = /etc/gosad/fifo/arp_fifo
-
-[gosa]
-gosa_activ = on
-gosa_ip = 10.89.1.155
-gosa_port = 9999
-gosa_passwd = ferdinand_frost
-gosa_timeout = 5                   
-
diff --git a/contrib/daemon/gosa-sd-bus b/contrib/daemon/gosa-si-bus
similarity index 100%
rename from contrib/daemon/gosa-sd-bus
rename to contrib/daemon/gosa-si-bus
diff --git a/contrib/daemon/gosa-si-bus.conf-template b/contrib/daemon/gosa-si-bus.conf-template
new file mode 100644
index 000000000..7ca56e906
--- /dev/null
+++ b/contrib/daemon/gosa-si-bus.conf-template
@@ -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/contrib/daemon/gosa-sc b/contrib/daemon/gosa-si-client
similarity index 100%
rename from contrib/daemon/gosa-sc
rename to contrib/daemon/gosa-si-client
diff --git a/contrib/daemon/gosa-si-client.cfg-template b/contrib/daemon/gosa-si-client.cfg-template
new file mode 100644
index 000000000..0c65e2cad
--- /dev/null
+++ b/contrib/daemon/gosa-si-client.cfg-template
@@ -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/contrib/daemon/gosa-sd b/contrib/daemon/gosa-si-daemon
similarity index 100%
rename from contrib/daemon/gosa-sd
rename to contrib/daemon/gosa-si-daemon
diff --git a/contrib/daemon/gosa-si-daemon.conf-template b/contrib/daemon/gosa-si-daemon.conf-template
new file mode 100644
index 000000000..8a07a631b
--- /dev/null
+++ b/contrib/daemon/gosa-si-daemon.conf-template
@@ -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                   
+
-- 
2.30.2