From ff7777e107586a4e31484dc4e279d7cdd8086a33 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 19 Nov 2023 19:35:02 +0900 Subject: [PATCH] Debian/Ubuntu: Capture core config files In Debian and Ubuntu, some core config files such as apache2.conf are located at the top-level config directory and are not captured. This ensures these files are also captured after test run. Change-Id: I28ea22a0e14769ba4bc1545a75569f9cf6e881d5 (cherry picked from commit 3768acbb559bc2ef5630e51cc709d7856469196f) (cherry picked from commit 3abed84f4cf759b789db4ff8908b3dbc02a7fd96) --- copy_logs.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/copy_logs.sh b/copy_logs.sh index a7fc07679..6991fd05a 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -240,9 +240,15 @@ sudo cp /etc/sudoers $LOG_DIR/sudoers.txt if uses_debs; then apache_conf=/etc/apache2 apache_logs=/var/log/apache2 + mkdir $LOG_DIR${apache_conf} + for f in apache2.conf ports.conf; do + if [ -f ${apache_conf}/${f} ]; then + sudo cp ${apache_conf}/${f} $LOG_DIR${apache_conf}/${f} + fi + done for d in conf.d sites-enabled mods-enabled ; do if [ -d ${apache_conf}/${d} ]; then - mkdir -p $LOG_DIR${apache_conf}/${d} + mkdir $LOG_DIR${apache_conf}/${d} sudo cp ${apache_conf}/${d}/* $LOG_DIR${apache_conf}/${d}/ fi done