Skip to content

Commit c16f60f

Browse files
committed
Configure judgedaemon for inplace-installs
Normalliy we symlink but this is not adviced as files under sudoers.d should be owned by root. We could chown this file to root but that would break the Recursing target `distclean' into: etc doc lib sql judge misc-tools webapp make[1]: Entering directory '/srv/domjudge/etc' rm -f dbpasswords.secret restapi.secret symfony_app.secret initial_admin_password.secret make[2]: Entering directory '/srv/domjudge/etc' rm -f apache.conf nginx-conf nginx-conf-inner domjudge-fpm.conf domserver-static.php judgehost-static.php runguard-config.h sudoers-domjudge config.h make[2]: Leaving directory '/srv/domjudge/etc' make[1]: Leaving directory '/srv/domjudge/etc' make[1]: Entering directory '/srv/domjudge/doc' Recursing target `distclean' into: manual examples make[2]: Entering directory '/srv/domjudge/doc/manual' make[3]: Entering directory '/srv/domjudge/doc/manual' rm -rf build/doctrees build/team/.doctrees make -C build/team clean make[4]: Entering directory '/srv/domjudge/doc/manual/build/team' rm -f *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla *.ps *.tar *.tar.gz *.tar.bz2 *.tar.xz domjudge-team-manual.pdf DOMjudge.pdf domjudge-team-manual.dvi DOMjudge.dvi *.fls *.fdb_latexmk make[4]: Leaving directory '/srv/domjudge/doc/manual/build/team' rm -f version.py substitutions.py html team make[3]: Leaving directory '/srv/domjudge/doc/manual' make[2]: Leaving directory '/srv/domjudge/doc/manual' make[2]: Entering directory '/srv/domjudge/doc/examples' make[3]: Entering directory '/srv/domjudge/doc/examples' rm -f hello.aux fltcmp.aux boolfind.aux hello.log fltcmp.log boolfind.log make[3]: Leaving directory '/srv/domjudge/doc/examples' make[2]: Leaving directory '/srv/domjudge/doc/examples' make[2]: Entering directory '/srv/domjudge/doc' make[2]: Nothing to be done for 'distclean-l'. make[2]: Leaving directory '/srv/domjudge/doc' make[1]: Leaving directory '/srv/domjudge/doc' make[1]: Entering directory '/srv/domjudge/lib' make[2]: Entering directory '/srv/domjudge/lib' rm -f lib.error.o lib.misc.o make[2]: Leaving directory '/srv/domjudge/lib' make[1]: Leaving directory '/srv/domjudge/lib' make[1]: Entering directory '/srv/domjudge/sql' make[2]: Entering directory '/srv/domjudge/sql' rm -f dj_setup_database rm -f files/defaultdata/compare/run \ files/defaultdata/java_javac_detect/DetectMain.class \ files/defaultdata/kt/DetectMain.class make[2]: Leaving directory '/srv/domjudge/sql' make[1]: Leaving directory '/srv/domjudge/sql' make[1]: Entering directory '/srv/domjudge/judge' make[2]: Entering directory '/srv/domjudge/judge' rm -f runguard runpipe evict runguard.o runpipe.o evict.o rm -f judgedaemon chroot-startstop.sh create_cgroups create-cgroups.service [email protected] make[2]: Leaving directory '/srv/domjudge/judge' make[1]: Leaving directory '/srv/domjudge/judge' make[1]: Entering directory '/srv/domjudge/misc-tools' make[2]: Entering directory '/srv/domjudge/misc-tools' rm -f rm -f fix_permissions configure-domjudge import-contest force-passwords dj_make_chroot dj_run_chroot dj_make_chroot_docker dj_judgehost_cleanup make[2]: Leaving directory '/srv/domjudge/misc-tools' make[1]: Leaving directory '/srv/domjudge/misc-tools' make[1]: Entering directory '/srv/domjudge/webapp' Recursing target `distclean' into: config make[2]: Entering directory '/srv/domjudge/webapp/config' make[3]: Entering directory '/srv/domjudge/webapp/config' rm -f rm -f autoload.php static.yaml make[3]: Leaving directory '/srv/domjudge/webapp/config' make[2]: Leaving directory '/srv/domjudge/webapp/config' make[2]: Entering directory '/srv/domjudge/webapp' rm -rf public/bundles/nelmioapidoc rm -f vendor/autoload_runtime.php make[2]: Leaving directory '/srv/domjudge/webapp' make[1]: Leaving directory '/srv/domjudge/webapp' make[1]: Entering directory '/srv/domjudge' rm -rf config.status config.cache config.log autom4te.cache rm -rf cov-int domjudge-scan.t* coverity-scan.tar.xz cov-submit-data-version.sh rm -f paths.mk make[1]: Leaving directory '/srv/domjudge'.
1 parent 1e96c76 commit c16f60f

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,8 @@ inplace-install-l:
238238
@echo " sudo make inplace-postinstall-apache"
239239
@echo " - Configure nginx"
240240
@echo " sudo make inplace-postinstall-nginx"
241+
@echo " - Configure judgedaemon
242+
@echo " sudo make inplace-postinstall-judgedaemon"
241243
@echo " - Set up database"
242244
@echo " ./sql/dj_setup_database -u root [-r|-p ROOT_PASS] install"
243245
@echo ""
@@ -291,6 +293,11 @@ inplace-postinstall-nginx: inplace-postinstall-permissions
291293
systemctl restart nginx
292294
systemctl restart php$(PHPVERSION)-fpm
293295

296+
inplace-postinstall-judgedaemon:
297+
cp $(CURDIR)/etc/sudoers-domjudge /etc/sudoers.d/domjudge
298+
chown root:root /etc/sudoers.d/domjudge
299+
chmod 0600 /etc/sudoers.d/domjudge
300+
294301
# Removes created symlinks; generated logs, submissions, etc. remain in output subdir.
295302
inplace-uninstall-l:
296303
rm -rf $(judgehost_libjudgedir)

0 commit comments

Comments
 (0)