From 14efc7d99041309a747ebbd014e404281086029d Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 8 Jan 2019 10:58:09 +0100
Subject: [PATCH] enable overriding the mime-type for entities/index.html using
 extended attributes

---
 eumd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh    | 3 +++
 global/overlay/etc/puppet/manifests/cosmos-site.pp      | 4 ++--
 md1.komreg.net/overlay/etc/mirror-mdq/post.d/20-mime.sh | 2 +-
 natmd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh   | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100755 eumd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh
 create mode 100755 natmd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh

diff --git a/eumd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh b/eumd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh
new file mode 100755
index 00000000..07522cc2
--- /dev/null
+++ b/eumd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+attr -q -s Content-Type -V "application/xml" entities/index.html
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 0fc7033b..eb8f6e2d 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -177,7 +177,7 @@ class eidas_hsm_client($luna_version="6.2") {
 }
 
 class md_signer($dest_host=undef,$dest_dir="",$version="eidas") {
-   package { ['xsltproc','libxml2-utils']: ensure => latest } ->
+   package { ['xsltproc','libxml2-utils','attr']: ensure => latest } ->
    sunet::pyff {$name:
       version           => $version,
       pound_and_varnish => false,
@@ -193,7 +193,7 @@ class md_signer($dest_host=undef,$dest_dir="",$version="eidas") {
          ssh_privkey       => safe_hiera("publisher_ssh_privkey")
       } ->
       sunet::scriptherder::cronjob { "${name}-publish":
-         cmd               => "env RSYNC_ARGS='--chown=www-data:www-data --chmod=D0755,F0664' /usr/local/bin/mirror-mdq.sh http://localhost root@${dest_host}:${dest_dir}",
+         cmd               => "env RSYNC_ARGS='--chown=www-data:www-data --chmod=D0755,F0664 --xattrs' /usr/local/bin/mirror-mdq.sh http://localhost root@${dest_host}:${dest_dir}",
          minute            => '*/5',
          ok_criteria       => ['exit_status=0'],
          warn_criteria     => ['max_age=30m']
diff --git a/md1.komreg.net/overlay/etc/mirror-mdq/post.d/20-mime.sh b/md1.komreg.net/overlay/etc/mirror-mdq/post.d/20-mime.sh
index 952ca5bc..07522cc2 100755
--- a/md1.komreg.net/overlay/etc/mirror-mdq/post.d/20-mime.sh
+++ b/md1.komreg.net/overlay/etc/mirror-mdq/post.d/20-mime.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-attr -s Content-Type -V "application/xml" entities/index.html
+attr -q -s Content-Type -V "application/xml" entities/index.html
diff --git a/natmd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh b/natmd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh
new file mode 100755
index 00000000..07522cc2
--- /dev/null
+++ b/natmd-common/overlay/etc/mirror-mdq/post.d/20-mime.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+attr -q -s Content-Type -V "application/xml" entities/index.html