From 6e4a7335a3ea761288dc07495fa76da6083a9f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 30 Dec 2021 03:47:24 +0100
Subject: Control whole webdav htpasswd file.

---
 modules/profiles/manifests/webdav_server.pp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/modules/profiles/manifests/webdav_server.pp b/modules/profiles/manifests/webdav_server.pp
index bd2bc92..1471495 100644
--- a/modules/profiles/manifests/webdav_server.pp
+++ b/modules/profiles/manifests/webdav_server.pp
@@ -27,6 +27,8 @@ define profiles::webdav_server (
     | EOF
   }
 
+  $lines = $users.map |$pair| { $pair.join(':') }.join("\n")
+
   file {
     default:
       owner   => $owner,
@@ -40,23 +42,13 @@ define profiles::webdav_server (
     $passwd_file:
       ensure  => 'file',
       mode    => '0660',
+      content => @("EOF")
+        # File managed by puppet
+        ${lines}
+        | EOF
       ;
   }
 
-  # add entries to the htpasswd file through
-  # $ echo "${user}:$(openssl passwd -apr1 $password)" >> .htpasswd
-
-  $users.each |$pair| {
-    $user = $pair[0]
-    $passwd = $pair[1]
-    file_line { "Add ${user} to dav passwd file":
-      ensure => present,
-      path   => $passwd_file,
-      line   => "${user}:${passwd}",
-      match  => "^${user}:"
-    }
-  }
-
   nginx::resource::location { $location:
     server         => $nginx_server,
     location_alias => $file_path,
-- 
cgit v1.2.3