From 377de0dbd491a4ef9c56cfdef862f104d3ef0b44 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Sep 02 2020 22:12:17 +0000
Subject: Merge branch 'cboltz-relnotes' into 'production'


minor fixes for release notes

See merge request infra/salt!441
---

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 @@
    <Directory "/srv/www/vhosts/doc.opensuse.org/release-notes/">
      Options Indexes MultiViews
      AllowOverride None
-     Order allow,deny
-     Allow from all
+     Require all granted
    </Directory>
 
    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"