Allow webserver traversal for both webservers

Author: vmcj

Makefile

@@ -261,6 +261,7 @@ inplace-install-l:
 	@echo "        # Also make sure you keep access"
 	@echo "        setfacl -R -m d:u:$(DOMJUDGE_USER):rwx  $(CURDIR)/webapp/var"
 	@echo "        setfacl -R -m   u:$(DOMJUDGE_USER):rwx  $(CURDIR)/webapp/var"
+	@echo "        And manually make sure the webserver has traversal access to: $(CURDIR)"
 	@echo "    - Configure webserver"
 	@echo "        Apache 2:"
 	@echo "           ln -sf $(CURDIR)/etc/apache.conf /etc/apache2/conf-available/domjudge.conf"
@@ -296,6 +297,10 @@ inplace-postinstall-permissions:
 		chcon -R -t httpd_sys_rw_content_t $(CURDIR)/webapp/public/images; \
 		chcon    -t httpd_exec_t $(CURDIR)/lib/alert; \
 	fi
+	while [ `pwd` != "/" ]; do \
+		setfacl -m u:$(WEBSERVER_GROUP):x .; \
+		cd ..; \
+	done
 
 inplace-postinstall-apache: inplace-postinstall-permissions
 	@if [ ! -d "/etc/apache2/conf-enabled" ]; then echo "Couldn't find directory /etc/apache2/conf-enabled. Is apache installed?"; false; fi
@@ -321,12 +326,7 @@ inplace-postinstall-nginx: inplace-postinstall-permissions
 	fi; \
 	service="systemctl restart $$service"; \
 	ln="ln -sf $(CURDIR)/etc/domjudge-fpm.conf $$phppool/domjudge-fpm.conf"; \
-	echo $$ln; echo $$service; $$ln; $$service;
-	
-	while [ `pwd` != "/" ]; do \
-		setfacl -m u:$(WEBSERVER_GROUP):x .; \
-		cd ..; \
-	done
+	echo $$ln; echo $$service; $$ln; $$service
 
 inplace-postinstall-judgedaemon:
 	cp $(CURDIR)/etc/sudoers-domjudge /etc/sudoers.d/domjudge