From b7946f6d74c870445445898452a96b59f0b00d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Wed, 25 Sep 2024 17:19:20 +0200 Subject: [PATCH] Reordering apache2 setup commands to reduce the number of service restart. Refs https://github.com/perfsonar/project/issues/1390 --- .gitignore | 2 ++ .../unibuild-packaging/deb/perfsonar-elmond.postinst | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 63f6b62..e894c6a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ unibuild-log unibuild-work/ unibuild-repo/ multiarch_build/ +# MacOS artifacts +.DS_Store diff --git a/elmond/perfsonar-elmond/unibuild-packaging/deb/perfsonar-elmond.postinst b/elmond/perfsonar-elmond/unibuild-packaging/deb/perfsonar-elmond.postinst index 741ec0e..0bfa7cb 100644 --- a/elmond/perfsonar-elmond/unibuild-packaging/deb/perfsonar-elmond.postinst +++ b/elmond/perfsonar-elmond/unibuild-packaging/deb/perfsonar-elmond.postinst @@ -21,11 +21,12 @@ case "$1" in if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then . /usr/share/apache2/apache2-maintscript-helper - apache2_invoke enmod ssl - apache2_invoke enmod proxy - apache2_invoke enmod proxy_http - apache2_invoke enmod headers apache2_invoke enconf apache-elmond + apache2_invoke enmod ssl reload + apache2_invoke enmod proxy reload + apache2_invoke enmod proxy_http reload + # Only doing a restart once to avoid triggering limits + apache2_invoke enmod headers restart fi ;;