Add captcha dir in Debian packaging (#642)

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

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

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/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)