[lemonldap-ng] 03/06: Add captcha dirs management

[Xavier Guimard]

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

xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.

commit 668968a6b0bdb742a4fe89ae0eae1383333e020c
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Tue Nov 12 06:07:27 2013 +0100

    Add captcha dirs management
---
 debian/liblemonldap-ng-manager-perl.install          |    1 +
 debian/liblemonldap-ng-portal-perl.dirs              |    1 +
 debian/liblemonldap-ng-portal-perl.lintian-overrides |    3 +++
 debian/liblemonldap-ng-portal-perl.postinst          |    2 --
 debian/rules                                         |   14 ++++++++++----
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/liblemonldap-ng-manager-perl.install b/debian/liblemonldap-ng-manager-perl.install
index f1d6230..05639c1 100644
--- a/debian/liblemonldap-ng-manager-perl.install
+++ b/debian/liblemonldap-ng-manager-perl.install
@@ -5,3 +5,4 @@
 /usr/share/lemonldap-ng/manager
 /var/lib/lemonldap-ng/manager
 /usr/share/lemonldap-ng/bin/lmConfigEditor
+/usr/share/lemonldap-ng/bin/lemonldap-ng-cli
diff --git a/debian/liblemonldap-ng-portal-perl.dirs b/debian/liblemonldap-ng-portal-perl.dirs
index 305b422..54c6ab4 100644
--- a/debian/liblemonldap-ng-portal-perl.dirs
+++ b/debian/liblemonldap-ng-portal-perl.dirs
@@ -1,3 +1,4 @@
+/var/lib/lemonldap-ng/captcha/data
 /var/lib/lemonldap-ng/portal/captcha_output
 /var/lib/lemonldap-ng/sessions/lock
 /var/lib/lemonldap-ng/notifications
diff --git a/debian/liblemonldap-ng-portal-perl.lintian-overrides b/debian/liblemonldap-ng-portal-perl.lintian-overrides
index a6d22c2..ebd4ca5 100644
--- a/debian/liblemonldap-ng-portal-perl.lintian-overrides
+++ b/debian/liblemonldap-ng-portal-perl.lintian-overrides
@@ -1,5 +1,8 @@
 # If file storage is used for sessions, user passord may be stored in this
 # directory, so it must not be readable by all but must be writable by www-data
+liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/captcha/ 0770 != 0755
+liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/captcha/data/ 0770 != 0755
 liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/notifications/ 0770 != 0755
+liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/portal/captcha_output/ 0770 != 0755
 liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/lock/ 0770 != 0755
 liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
diff --git a/debian/liblemonldap-ng-portal-perl.postinst b/debian/liblemonldap-ng-portal-perl.postinst
index cf40671..2ecddea 100644
--- a/debian/liblemonldap-ng-portal-perl.postinst
+++ b/debian/liblemonldap-ng-portal-perl.postinst
@@ -7,8 +7,6 @@ set -e
 BUILDPORTALWSDL=/usr/share/lemonldap-ng/bin/buildPortalWSDL
 WSDLFILE=/var/lib/lemonldap-ng/portal/portal.wsdl
 
-CAPTCHA_DIR=/var/lib/lemonldap-ng/portal/captcha_output
-
 if [ "$1" == "configure" ]
 then
 	$BUILDPORTALWSDL > $WSDLFILE || true
diff --git a/debian/rules b/debian/rules
index fd09499..4216b80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ NOTIFICATIONSDIR=$(LMVARDIR)/notifications
 CONFSTORAGEDIR=$(LMVARDIR)/conf
 FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1
 LMINIFILE=$(CONFDIR)/lemonldap-ng.ini
-CAPTCHADIR=$(LMVARDIR)/portal/captcha_output
+CAPTCHADIR=$(LMVARDIR)/captcha
+CAPTCHAOUTPUTDIR=$(LMVARDIR)/portal/captcha_output
 
 %:
 	dh $@
@@ -63,11 +64,16 @@ override_dh_fixperms:
 		debian/*/$(SESSIONSDIR)/lock \
 		debian/*/$(NOTIFICATIONSDIR) \
 		debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR) \
-		debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)
+		debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR) \
+		debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)/data \
+		debian/liblemonldap-ng-portal-perl/$(CAPTCHAOUTPUTDIR)
 	chgrp www-data debian/liblemonldap-ng-common-perl/$(LMINIFILE) \
 		debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE)
-	chmod 770 debian/*/$(SESSIONSDIR) debian/*/$(SESSIONSDIR)/lock
-	chmod 770 debian/*/$(NOTIFICATIONSDIR)
+	chmod 770 debian/*/$(SESSIONSDIR) debian/*/$(SESSIONSDIR)/lock \
+		debian/*/$(NOTIFICATIONSDIR) \
+		debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR) \
+		debian/liblemonldap-ng-portal-perl/$(CAPTCHADIR)/data \
+		debian/liblemonldap-ng-portal-perl/$(CAPTCHAOUTPUTDIR)
 	chmod 750 debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR)
 	chmod 640 debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE) \
 		debian/liblemonldap-ng-common-perl/$(LMINIFILE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git