Merge branch 'develop'

2 files changed, 34 insertions, 0 deletions

diff --git a/puppet/modules/apache b/puppet/modules/apache
deleted file mode 160000
-Subproject 117bed9a9263c21d253d86b667eb165948efdc2
diff --git a/puppet/modules/apache/manifests/htpasswd_user.pp b/puppet/modules/apache/manifests/htpasswd_user.pp
new file mode 100644
index 00000000..82fbce45
--- /dev/null
+++ b/puppet/modules/apache/manifests/htpasswd_user.pp
@@ -0,0 +1,34 @@
+# ToDo: This should be rewritten as native type
+define apache::htpasswd_user(
+    $password,
+    $password_iscrypted = false,
+    $ensure   = 'present',
+    $site     = 'absent',
+    $username = 'absent',
+    $path     = 'absent'
+){
+    case $username {
+        'absent': { $real_username = $name }
+        default: { $real_username = $username }
+    }
+    case $site {
+        'absent': { $real_site = $name }
+        default: { $real_site = $site }
+    }
+    if $password_iscrypted {
+        $real_password = $password
+    } else {
+        $real_password = htpasswd_sha1($password)
+    }
+
+    case $path {
+        'absent': { $real_path = "/var/www/htpasswds/${real_site}" }
+        default:  { $real_path = $path }
+    }
+
+    file_line{"htpasswd_for_${real_site}":
+        ensure => $ensure,
+        path   => $real_path,
+        line   => "${username}:${real_password}",
+    }
+}