[debian-edu-commits] debian-edu/pkg-team/ 04/08: debian/patches: Update 2001_debian-defaults.patch. Rebase against patches above and update LDAP_URI default (empty string now).

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository ldap2zone.

commit 9972e1e025b911f36037693091de2d1225caff9f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 15 15:42:06 2016 +0100

    debian/patches: Update 2001_debian-defaults.patch. Rebase against patches above and update LDAP_URI default (empty string now).
---
 debian/patches/2001_debian-defaults.patch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/patches/2001_debian-defaults.patch b/debian/patches/2001_debian-defaults.patch
index 3158abe..bb26531 100644
--- a/debian/patches/2001_debian-defaults.patch
+++ b/debian/patches/2001_debian-defaults.patch
@@ -3,7 +3,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 --- a/ldap2bind
 +++ b/ldap2bind
-@@ -1,5 +1,30 @@
+@@ -1,5 +1,31 @@
  #!/bin/sh
  
 +# Should we run the cronjob
@@ -11,8 +11,9 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +RUN_DEPLOY="false"
 +
 +# How the LDAP server can be accessed
-+# DEFAULT: "ldap://localhost"
-+LDAP_URI="ldap://localhost"
++# DEFAULT: ""
++# Example: "ldap://localhost"
++LDAP_URI=""
 +
 +# Where the bind config is stored
 +# DEFAULT: "/etc/bind"
@@ -33,4 +34,4 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +
  [ -r /etc/default/ldap2zone ] && . /etc/default/ldap2zone
  
- if [ "$RUN_DEPLOY" != "false" ]; then
+ # if shell is non-interactive (e.g. like when called via CRON) and RUN_DEPLOY is false, exit silently.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/ldap2zone.git