Merge branch 'security-upload-host' of https://github.com/aburch/dsa-puppet

diff --git a/modules/salsa/manifests/packages.pp b/modules/salsa/manifests/packages.pp
index a0a4f86..a9c479c 100644 (file)
--- a/modules/salsa/manifests/packages.pp
+++ b/modules/salsa/manifests/packages.pp
@@ -30,4 +30,10 @@ class salsa::packages inherits salsa {
        ]
 
        ensure_packages($requirements, { ensure => 'installed' })
+
+       $mgmt_requirements = [
+               'ansible',
+       ]
+
+       ensure_packages($mgmt_requirements, { ensure => 'installed' })
 }

diff --git a/modules/salsa/manifests/params.pp b/modules/salsa/manifests/params.pp
index 2bd2a30..d8e0f0a 100644 (file)
--- a/modules/salsa/manifests/params.pp
+++ b/modules/salsa/manifests/params.pp
@@ -4,7 +4,7 @@ class salsa::params {
 
        $user = "git"
        $group = "git"
-       $home = "/srv/${servicename}}"
+       $home = "/srv/${servicename}"
 
        $db_name = "salsa"
        $db_role = "salsa"

diff --git a/modules/salsa/manifests/redis.pp b/modules/salsa/manifests/redis.pp
index a69f934..6a438f6 100644 (file)
--- a/modules/salsa/manifests/redis.pp
+++ b/modules/salsa/manifests/redis.pp
@@ -24,4 +24,9 @@ class salsa::redis inherits salsa {
                group => redis,
                notify  => Service['redis-server'],
        }
+
+       exec { 'add-git-user-to-redis':
+               command => 'adduser git redis',
+               onlyif  => "getent group redis > /dev/null && ! getent group redis | grep '\\<git\\>' > /dev/null"
+       }
 }