diff --git a/.github/jobs/configure-checks/all.bats b/.github/jobs/configure-checks/all.bats index b754c33b960..233779b46b8 100644 --- a/.github/jobs/configure-checks/all.bats +++ b/.github/jobs/configure-checks/all.bats @@ -186,6 +186,9 @@ compile_assertions_finished () { groupdel ${www_group} || true done repo-install httpd + for www_group in nginx apache; do + cat /etc/{g,}shadow /etc/group|grep ${www_group} || true + done run ./configure --with-domjudge-user=$u assert_line "checking webserver-group... apache (detected)" assert_line " * webserver group.....: apache" diff --git a/webapp/Makefile b/webapp/Makefile index 7c337993a9d..addcfbf5e70 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -12,16 +12,18 @@ SUBDIRS = config copy-bundle-assets: # We can not use bin/console here, as when using a fakeroot, # the include paths are broken. We just copy in the data we need - -rm -rf public/bundles/nelmioapidoc + -rm -rf public/bundles/nelmioapidoc/* mkdir -p public/bundles/nelmioapidoc - cp -R ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/ + cp -Ra ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/ clean-l: -rm -rf public/bundles/nelmioapidoc -install-domserver: +domserver-l: # This must be done first to install with the rest. $(MAKE) copy-bundle-assets + +install-domserver: $(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir); for d in bin config migrations public resources src templates tests ; do \ $(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \