summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-03-14 14:22:02 +0100
committerAndrew Branson <andrew.branson@cern.ch>2013-03-14 14:22:02 +0100
commit7729665e9e2a03987bf5ea65914dd2ac1cdd8785 (patch)
tree4af9c24822458f48e9a937e4db16c5c847977d1d
parentb1346b0c9265f0f8ef179846be70ed5b3b4df322 (diff)
Simpler config files for training
-rw-r--r--bin/.gitignore2
-rw-r--r--bin/client.conf (renamed from bin/client.conf.example)1
-rw-r--r--bin/dev.clc.example6
-rw-r--r--bin/server.conf2
-rw-r--r--bin/server.conf.example4
5 files changed, 5 insertions, 10 deletions
diff --git a/bin/.gitignore b/bin/.gitignore
index 8f0d99b..0dc19c3 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,3 +1 @@
/*.clc
-/client.conf
-/server.conf
diff --git a/bin/client.conf.example b/bin/client.conf
index e433c2e..6667aae 100644
--- a/bin/client.conf.example
+++ b/bin/client.conf
@@ -1,3 +1,2 @@
-LocalCentre=local
ClusterStorage=LDAPClientReader,ProxyLoader
EnableItemErase=true
diff --git a/bin/dev.clc.example b/bin/dev.clc.example
index 0445b91..c22b3b0 100644
--- a/bin/dev.clc.example
+++ b/bin/dev.clc.example
@@ -7,14 +7,14 @@ ItemServer.Proxy.port=1555
// LDAP Lookup config
LDAP.GlobalPath=SUFFIX
-LDAP.RootPath=cn=cristal2
+LDAP.RootPath=cn=cristal
LDAP.LocalPath=cn=dev
LDAP.port=389
LDAP.host=localhost
LDAP.user=USER
LDAP.password=PASS
-XMLDB.URI=xmldb:exist://uwesrv01.cern.ch:8080/exist/xmlrpc/db
+XMLDB.URI=xmldb:exist://HOSTNAME:8080/exist/xmlrpc/db
XMLDB.root=dev
XMLDB.user=admin
-XMLDB.pass=PASS \ No newline at end of file
+XMLDB.pass=PASS
diff --git a/bin/server.conf b/bin/server.conf
new file mode 100644
index 0000000..16f9ddd
--- /dev/null
+++ b/bin/server.conf
@@ -0,0 +1,2 @@
+ClusterStorage=LDAPClusterStorage,XMLDBClusterStorage
+ItemServer.Console.allow=localhost
diff --git a/bin/server.conf.example b/bin/server.conf.example
deleted file mode 100644
index 46136ef..0000000
--- a/bin/server.conf.example
+++ /dev/null
@@ -1,4 +0,0 @@
-LocalCentre=local
-ClusterStorage=LDAPClusterStorage,XMLClusterStorage
-XMLStorage.root=/path/to/xmldb/dir
-ItemServer.Console.allow=localhost