From 59b0853ab4fda4429cb91b878ace4310749b597f Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Aug 31 2020 09:39:22 +0000 Subject: minor fixes for release notes - update apache config to use Require instead of Allow - fix quoting of wildcard in update_release_notes script --- diff --git a/salt/profile/documentation/files/002-doc.conf b/salt/profile/documentation/files/002-doc.conf index abe6437..9320ac5 100644 --- a/salt/profile/documentation/files/002-doc.conf +++ b/salt/profile/documentation/files/002-doc.conf @@ -11,8 +11,7 @@ Options Indexes MultiViews AllowOverride None - Order allow,deny - Allow from all + Require all granted LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%{X-Forwarded-For}i\"" combinedproxy diff --git a/salt/profile/documentation/files/update_release_notes b/salt/profile/documentation/files/update_release_notes index 4e74f17..b6f8ab0 100644 --- a/salt/profile/documentation/files/update_release_notes +++ b/salt/profile/documentation/files/update_release_notes @@ -297,4 +297,4 @@ while read line; do done < "$RELEASENOTES_DATA" # Only after everything suceeds, we rsync the contents to /srv -rsync -arz --delete-after "$@" "$RELNOTESDIR/*" "$DESTDIR" +rsync -arz --delete-after "$@" "$RELNOTESDIR/"* "$DESTDIR"