From a3650e57c8b6b99e55a68c7e9aa7a173a533f19b Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 23 Nov 2025 19:13:28 +0100 Subject: [PATCH 1/2] make ACLs explicit so the admin can see the docs --- Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Makefile b/Makefile index 910aeb1f8e..ea2af5c92c 100644 --- a/Makefile +++ b/Makefile @@ -254,6 +254,14 @@ inplace-install-l: @echo " setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/verdicts.php" @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp" @echo " setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp" + @echo " setfacl -m d:u:$(WEBSERVER_GROUP):x $(CURDIR)/doc" + @echo " setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc" + @echo " setfacl -m d:u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual" + @echo " setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual" + @echo " setfacl -m d:u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual/build" + @echo " setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual/build" + @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html" + @echo " setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html" @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var" @echo " setfacl -R -m u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var" @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/public/images/countries" @@ -292,6 +300,14 @@ inplace-postinstall-permissions: setfacl -m u:$(WEBSERVER_GROUP):r $(CURDIR)/etc/verdicts.php setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/webapp + setfacl -m d:u:$(WEBSERVER_GROUP):x $(CURDIR)/doc + setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc + setfacl -m d:u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual + setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual + setfacl -m d:u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual/build + setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual/build + setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html + setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var setfacl -R -m u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/public/images/countries From 8b75002c9ed3cfe6f094920b63fb7f0cb799d983 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 23 Nov 2025 19:23:40 +0100 Subject: [PATCH 2/2] Properly link the teammanual for inplace installs --- Makefile | 2 ++ doc/manual/.gitignore | 1 + doc/manual/Makefile | 1 + 3 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index ea2af5c92c..13543eab5f 100644 --- a/Makefile +++ b/Makefile @@ -262,6 +262,7 @@ inplace-install-l: @echo " setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual/build" @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html" @echo " setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html" + @echo " setfacl -R -m u:$(WEBSERVER_GROUP):r $(CURDIR)/doc/manual/build/domjudge-team-manual.pdf" @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var" @echo " setfacl -R -m u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var" @echo " setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/public/images/countries" @@ -308,6 +309,7 @@ inplace-postinstall-permissions: setfacl -m u:$(WEBSERVER_GROUP):x $(CURDIR)/doc/manual/build setfacl -R -m d:u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html setfacl -R -m u:$(WEBSERVER_GROUP):rx $(CURDIR)/doc/manual/build/html + setfacl -R -m u:$(WEBSERVER_GROUP):r $(CURDIR)/doc/manual/build/domjudge-team-manual.pdf setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var setfacl -R -m u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/var setfacl -R -m d:u:$(WEBSERVER_GROUP):rwx $(CURDIR)/webapp/public/images/countries diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore index adcc78c6e4..9b52e2b37b 100644 --- a/doc/manual/.gitignore +++ b/doc/manual/.gitignore @@ -4,3 +4,4 @@ /html /team /conf_ref.rst +/domjudge-team-manual.pdf diff --git a/doc/manual/Makefile b/doc/manual/Makefile index 52b3fd1504..37585e99e0 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -40,6 +40,7 @@ inplace-install: docs inplace-install-l: ln -sf build/html ln -sf build/team + ln -sf build/domjudge-team-manual.pdf inplace-uninstall-l: -rm -f html team