--- etc/config.yml	2008/03/13 14:22:53	11
+++ etc/config.yml	2008/06/16 12:45:15	170
@@ -8,13 +8,13 @@
   Database: 
     AutoUpgrade: 1
     CheckSchema: 1
-    Database: cadmin
-    Driver: SQLite
+    Database: a3c
+    Driver: Pg
     Host: localhost
-    Password: ''
+    Password: 'a3c'
     RecordBaseClass: Jifty::DBI::Record::Cachable
-    User: ''
-    Version: 0.0.1
+    User: 'a3c'
+    Version: 0.0.4
   DevelMode: 1
   L10N: 
     PoDir: share/po
@@ -27,14 +27,22 @@
     - LetMe: {}
     - SkeletonApp: {}
     - REST: {}
-    - Halo: {}
+#    - Halo: {}
     - ErrorTemplates: {}
     - OnlineDocs: {}
     - CompressedCSSandJS: {}
     - AdminUI: {}
+    - Debug: {}
     - User: {}
+#    - Login: {}
     - Authentication::Password: {}
-    - Debug: {}
+    - Authentication::Ldap:
+       LDAPhost: ldap.carnet.hr
+       LDAPbase: dc=carnet,dc=hr
+       LDAPName: cn                     # displayname, cn
+#       LDAPMail: mailLocalAddress       # email used optionnal
+       LDAPuid: uid
+#       LDAPssl: 0
 
   PubSub: 
     Backend: Memcached
@@ -65,6 +73,26 @@
 # values are overriden by site_config.yml
 application:
   LDAP:
-    Server: 'ldap.example.com'
-    DN: 'cn=foo,dc=skole,dc=hr'
-    Password: 'hax0r'
+    server: 'ldap.example.com'
+    dn: 'cn=foo,dc=example,dc=com'
+    password: 'hax0r'
+    # LDAP search
+    base: 'dc=example,dc=com'
+    objectClass:
+#      person: inetOrgPerson
+#      organization: organization
+      person: hrEduPerson
+      organization: hrEduOrg
+    link:
+      person_filter: HrEduPersonHomeOrg
+      display_from: name
+      value_from: cn
+
+  strix:
+    dir: data/strix/
+    database:
+      host: localhost
+      port: 15432
+      user: web
+      passwd: ''
+