Skip to content

Commit ab98a12

Browse files
committed
Make sure the webserver can reach the installation directory
1 parent 1e527a1 commit ab98a12

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

Makefile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,9 @@ inplace-install-l:
250250
@echo " - Give the webserver access to things it needs"
251251
@echo " setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/dbpasswords.secret"
252252
@echo " setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/symfony_app.secret"
253+
@echo " setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/domserver-static.php"
254+
@echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp"
255+
@echo " setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp"
253256
@echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var"
254257
@echo " setfacl -R -m u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var"
255258
@echo " setfacl -R -m d:m::rwx $(CURDIR)/webapp/var"
@@ -274,6 +277,9 @@ inplace-install-l:
274277
inplace-postinstall-permissions:
275278
setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/dbpasswords.secret
276279
setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/symfony_app.secret
280+
setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/domserver-static.php
281+
setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp
282+
setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp
277283
setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var
278284
setfacl -R -m u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var
279285
setfacl -R -m d:u:$(DOMJUDGE_USER):rwx $(CURDIR)/webapp/var
@@ -313,7 +319,12 @@ inplace-postinstall-nginx: inplace-postinstall-permissions
313319
fi; \
314320
service="systemctl restart $$service"; \
315321
ln="ln -sf $(CURDIR)/etc/domjudge-fpm.conf $$phppool/domjudge-fpm.conf"; \
316-
echo $$ln; echo $$service; $$ln; $$service
322+
echo $$ln; echo $$service; $$ln; $$service;
323+
324+
while [ `pwd` != "/" ]; do \
325+
setfacl -m u:$(WEBSERVER_GROUP):x .; \
326+
cd ..; \
327+
done
317328

318329
inplace-postinstall-judgedaemon:
319330
cp $(CURDIR)/etc/sudoers-domjudge /etc/sudoers.d/domjudge

0 commit comments

Comments
 (0)