[debian-edu-commits] r78900 - in branches/wheezy/debian-edu-config: cf etc/gosa

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-01-29 21:11:16 +0000 (Tue, 29 Jan 2013)
New Revision: 78900

Modified:
   branches/wheezy/debian-edu-config/cf/cf.ldap2zone
   branches/wheezy/debian-edu-config/etc/gosa/gosa.conf
Log:
fix error in gosa.conf; make cf-ldap2zone work 


Modified: branches/wheezy/debian-edu-config/cf/cf.ldap2zone
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.ldap2zone	2013-01-29 17:43:19 UTC (rev 78899)
+++ branches/wheezy/debian-edu-config/cf/cf.ldap2zone	2013-01-29 21:11:16 UTC (rev 78900)
@@ -6,8 +6,6 @@
   debian.server.installation::
     # Configure ldap2zone for Debian Edu: 
     { /etc/default/ldap2zone
-    BeginGroupIfNoSuchLine 'BIND_DATA="/etc/bind"'
        LocateLineMatching '#BIND_DATA=/var/cache/bind"'
        InsertLine 'BIND_DATA="/etc/bind"'
-    EndGroup
     }

Modified: branches/wheezy/debian-edu-config/etc/gosa/gosa.conf
===================================================================
--- branches/wheezy/debian-edu-config/etc/gosa/gosa.conf	2013-01-29 17:43:19 UTC (rev 78899)
+++ branches/wheezy/debian-edu-config/etc/gosa/gosa.conf	2013-01-29 21:11:16 UTC (rev 78900)
@@ -461,11 +461,11 @@
         honourIvbbAttributes="false" 
         enableSnapshots="true" 
         snapshotBase="ou=snapshots,dc=skole,dc=skolelinux,dc=no" 
-        snapshotAdminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" snapshotAdminPassword=".KN/LX1J" 
+        snapshotAdminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" snapshotAdminPassword="$GOSAPWD" 
         snapshotURI="ldaps://ldap.intern/" 
         config="ou=gosa,ou=configs,ou=systems,dc=skole,dc=skolelinux,dc=no">
             <referral URI="ldap://ldap.intern/dc=skole,dc=skolelinux,dc=no" 
-                adminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" adminPassword=".KN/LX1J"/>
+                adminDn="cn=gosa-admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no" adminPassword="$GOSAPWD"/>
     </location>
   </main>
 </conf>