dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old captcha dirs (#780)

Browse Source
This commit is contained in:
Clément Oudot 2014-12-19 09:07:29 +00:00
parent 08bee459b2
commit f801c179bc
6 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -82,14 +82,10 @@ RAPACHEPSESSIONFILELOCKDIR=$(DESTDIR)/$(APACHEPSESSIONFILELOCKDIR)
APACHEFILENOTIFDIR=$(DATADIR)/notifications APACHEFILENOTIFDIR=$(DATADIR)/notifications
RFILENOTIFDIR=$(DESTDIR)/$(APACHEFILENOTIFDIR) RFILENOTIFDIR=$(DESTDIR)/$(APACHEFILENOTIFDIR)
# LL::NG captcha data dir # LL::NG captcha dir
CAPTCHADIR=$(DATADIR)/captcha/data CAPTCHADIR=$(DATADIR)/captcha
RCAPTCHADIR=$(DESTDIR)/$(CAPTCHADIR) RCAPTCHADIR=$(DESTDIR)/$(CAPTCHADIR)
# LL::NG captcha output dir
CAPTCHAOUTPUTDIR=$(PORTALDIR)/captcha_output
RCAPTCHAOUTPUTDIR=$(DESTDIR)/$(CAPTCHAOUTPUTDIR)
# Apache user/group # Apache user/group
APACHEUSER= APACHEUSER=
APACHEGROUP= APACHEGROUP=
@ -314,7 +310,7 @@ install_site: install_manager_site install_portal_site install_handler_site inst
@echo "5 - Connect to Manager at http://manager.${DNSDOMAIN}/ to edit configuration" @echo "5 - Connect to Manager at http://manager.${DNSDOMAIN}/ to edit configuration"
@echo @echo
@if [ ! "$(APACHEUSER)" ]; then \ @if [ ! "$(APACHEUSER)" ]; then \
echo;echo " Warning, since APACHEUSER was not set, $(APACHESESSIONFILEDIR), $(APACHEPSESSIONFILEDIR), $(CAPTCHADIR), $(RCAPTCHAOUTPUTDIR) and $(CONFDIR) have permissive permissions."; \ echo;echo " Warning, since APACHEUSER was not set, $(APACHESESSIONFILEDIR), $(APACHEPSESSIONFILEDIR), $(CAPTCHADIR) and $(CONFDIR) have permissive permissions."; \
echo " Fix them by yourself to restrict their view to apache process only"; \ echo " Fix them by yourself to restrict their view to apache process only"; \
fi fi
@echo @echo
@ -427,9 +423,7 @@ install_conf_dir: install_sessions_dir install_notif_dir install_captcha_dir
@$(PERL) -000 -i -pe "s#^(persistentStorageOptions\\n\\s+)'[^\\n]*?'\$$#\$${1}\'\\\$$data1 = {&39;Directory&39; => &39;$(APACHEPSESSIONFILEDIR)&39;,&39;LockDirectory&39; => &39;$(APACHEPSESSIONFILELOCKDIR)&39;};'#m" $(RFILECONFIGDIR)/lmConf-1 @$(PERL) -000 -i -pe "s#^(persistentStorageOptions\\n\\s+)'[^\\n]*?'\$$#\$${1}\'\\\$$data1 = {&39;Directory&39; => &39;$(APACHEPSESSIONFILEDIR)&39;,&39;LockDirectory&39; => &39;$(APACHEPSESSIONFILELOCKDIR)&39;};'#m" $(RFILECONFIGDIR)/lmConf-1
@$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g;\ @$(PERL) -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g;\
s#__SESSIONDIR__#$(APACHESESSIONFILEDIR)#g;\ s#__SESSIONDIR__#$(APACHESESSIONFILEDIR)#g;\
s#__NOTIFICATIONDIR__#$(APACHEFILENOTIFDIR)#g;\ s#__NOTIFICATIONDIR__#$(APACHEFILENOTIFDIR)#g;' $(RFILECONFIGDIR)/lmConf-1
s#__CAPTCHADIR__#$(CAPTCHADIR)#g;\
s#__CAPTCHAOUTPUTDIR__#$(CAPTCHAOUTPUTDIR)#g;' $(RFILECONFIGDIR)/lmConf-1
@if [ "$(APACHEUSER)" != "" ]; then \ @if [ "$(APACHEUSER)" != "" ]; then \
chown $(APACHEUSER) $(RFILECONFIGDIR) || exit 1; \ chown $(APACHEUSER) $(RFILECONFIGDIR) || exit 1; \
if [ "$(APACHEGROUP)" != "" ]; then \ if [ "$(APACHEGROUP)" != "" ]; then \
@ -470,16 +464,16 @@ install_notif_dir:
fi fi
install_captcha_dir: install_captcha_dir:
@install -m 777 -v -d $(RCAPTCHADIR) $(RCAPTCHAOUTPUTDIR) @install -m 777 -v -d $(RCAPTCHADIR)
# Fix captcha directory permissions # Fix captcha directory permissions
@if [ "$(APACHEUSER)" != "" ]; then \ @if [ "$(APACHEUSER)" != "" ]; then \
chown $(APACHEUSER) $(RCAPTCHADIR) $(RCAPTCHAOUTPUTDIR) || exit 1; \ chown $(APACHEUSER) $(RCAPTCHADIR) || exit 1; \
if [ "$(APACHEGROUP)" != "" ]; then \ if [ "$(APACHEGROUP)" != "" ]; then \
chgrp $(APACHEGROUP) $(RCAPTCHADIR) $(RCAPTCHAOUTPUTDIR) || exit 1; \ chgrp $(APACHEGROUP) $(RCAPTCHADIR) || exit 1; \
fi; \ fi; \
chmod 770 $(RCAPTCHADIR) $(RCAPTCHAOUTPUTDIR); \ chmod 770 $(RCAPTCHADIR); \
else \ else \
chmod 777 $(RCAPTCHADIR) $(RCAPTCHAOUTPUTDIR); \ chmod 777 $(RCAPTCHADIR); \
fi fi
postconf_hosts: postconf_hosts:

6
_example/conf/lmConf-1
View File

@ -82,9 +82,3 @@ notificationStorage
notificationStorageOptions notificationStorageOptions
'$data1 = {'dirName' => '__NOTIFICATIONDIR__'};' '$data1 = {'dirName' => '__NOTIFICATIONDIR__'};'
captcha_data
'__CAPTCHADIR__'
captcha_output
'__CAPTCHAOUTPUTDIR__'

3
debian/liblemonldap-ng-portal-perl.dirs vendored
View File

@ -1,5 +1,4 @@
/var/lib/lemonldap-ng/captcha/data /var/lib/lemonldap-ng/captcha
/var/lib/lemonldap-ng/portal/captcha_output
/var/lib/lemonldap-ng/sessions/lock /var/lib/lemonldap-ng/sessions/lock
/var/lib/lemonldap-ng/psessions/lock /var/lib/lemonldap-ng/psessions/lock
/var/lib/lemonldap-ng/notifications /var/lib/lemonldap-ng/notifications

2
debian/liblemonldap-ng-portal-perl.lintian-overrides vendored
View File

@ -1,9 +1,7 @@
# If file storage is used for sessions, user passord may be stored in this # 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 # 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/ 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/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/lock/ 0770 != 0755
liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755 liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/psessions/lock/ 0770 != 0755 liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/psessions/lock/ 0770 != 0755

9
debian/rules vendored
View File

@ -15,7 +15,6 @@ CONFSTORAGEDIR=$(LMVARDIR)/conf
FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1 FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1
LMINIFILE=$(CONFDIR)/lemonldap-ng.ini LMINIFILE=$(CONFDIR)/lemonldap-ng.ini
CAPTCHADIR=$(LMVARDIR)/captcha CAPTCHADIR=$(LMVARDIR)/captcha
CAPTCHAOUTPUTDIR=$(LMVARDIR)/portal/captcha_output
%: %:
dh $@ dh $@
@ -68,17 +67,13 @@ override_dh_fixperms:
debian/*/$(PSESSIONSDIR)/lock \ debian/*/$(PSESSIONSDIR)/lock \
debian/*/$(NOTIFICATIONSDIR) \ debian/*/$(NOTIFICATIONSDIR) \
debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR) \ 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) \ chgrp www-data debian/liblemonldap-ng-common-perl/$(LMINIFILE) \
debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE) debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE)
chmod 770 debian/*/$(SESSIONSDIR) debian/*/$(SESSIONSDIR)/lock \ chmod 770 debian/*/$(SESSIONSDIR) debian/*/$(SESSIONSDIR)/lock \
debian/*/$(PSESSIONSDIR) debian/*/$(PSESSIONSDIR)/lock \ debian/*/$(PSESSIONSDIR) debian/*/$(PSESSIONSDIR)/lock \
debian/*/$(NOTIFICATIONSDIR) \ debian/*/$(NOTIFICATIONSDIR) \
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)
chmod 750 debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR) chmod 750 debian/liblemonldap-ng-common-perl/$(CONFSTORAGEDIR)
chmod 640 debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE) \ chmod 640 debian/liblemonldap-ng-common-perl/$(FIRSTCONFFILE) \
debian/liblemonldap-ng-common-perl/$(LMINIFILE) debian/liblemonldap-ng-common-perl/$(LMINIFILE)

3
rpm/lemonldap-ng.spec
View File

@ -390,8 +390,6 @@ chmod 770 %{buildroot}%{lm_vardir}/psessions
chmod 770 %{buildroot}%{lm_vardir}/psessions/lock chmod 770 %{buildroot}%{lm_vardir}/psessions/lock
chmod 770 %{buildroot}%{lm_vardir}/notifications chmod 770 %{buildroot}%{lm_vardir}/notifications
chmod 770 %{buildroot}%{lm_vardir}/captcha chmod 770 %{buildroot}%{lm_vardir}/captcha
chmod 770 %{buildroot}%{lm_vardir}/captcha/data
chmod 770 %{buildroot}%{lm_vardir}/portal/captcha_output
# Touch for ghost # Touch for ghost
mkdir -p %buildroot%{apache_confdir} mkdir -p %buildroot%{apache_confdir}
@ -526,7 +524,6 @@ rm -rf %{buildroot}
%{lm_sharedir}/portal-skins %{lm_sharedir}/portal-skins
%defattr(750,%{lm_apacheuser},%{lm_apachegroup},-) %defattr(750,%{lm_apacheuser},%{lm_apachegroup},-)
%dir %{lm_vardir}/captcha %dir %{lm_vardir}/captcha
%dir %{lm_vardir}/captcha/data
%files -n lemonldap-ng-test %files -n lemonldap-ng-test
%defattr(-,root,root,-) %defattr(-,root,root,-)