add defaults values for user created by puppet, to remove duplication

9 files changed, 12 insertions, 27 deletions

diff --git a/deployment/releasekey/manifests/init.pp b/deployment/releasekey/manifests/init.pp
index 89310040..9db97994 100644
--- a/deployment/releasekey/manifests/init.pp
+++ b/deployment/releasekey/manifests/init.pp
@@ -6,17 +6,12 @@ class releasekey {
     }
 
     class base inherits variable {
-	group {"$sign_login":
-	    ensure => present,
-	}
+	group {"$sign_login": }
 
 	user {"$sign_login":
-	    ensure => present,
 	    comment => "System user to sign Mageia Releases",
-	    managehome => true,
 	    home => $sign_home_dir,
 	    gid => $sign_login,
-	    shell => "/bin/bash",
 	    require => Group[$sign_login],
 	}
 
diff --git a/deployment/softwarekey/manifests/init.pp b/deployment/softwarekey/manifests/init.pp
index 4296cce0..d07e8276 100644
--- a/deployment/softwarekey/manifests/init.pp
+++ b/deployment/softwarekey/manifests/init.pp
@@ -6,17 +6,12 @@ class softwarekey {
     }
 
     class base inherits variable {
-	group {"$sign_login":
-	    ensure => present,
-	}
+        group {"$sign_login": }
 
 	user {"$sign_login":
-	    ensure => present,
 	    comment => "System user to sign Mageia Software",
-	    managehome => true,
 	    home => $sign_home_dir,
 	    gid => $sign_login,
-	    shell => "/bin/bash",
 	    require => Group[$sign_login],
 	}
 
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 39e0cabd..be11fb90 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -16,6 +16,16 @@ File {
     mode => 644,
 }
 
+Group {
+    ensure => present,
+}
+
+User {
+    ensure => present,
+    managehome => true,
+    shell => "/bin/bash",
+}
+
 define local_script($content, 
                     $owner = "root", 
                     $group = 'root', 
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index cc3439e4..291d0ef1 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -9,8 +9,6 @@ class blog {
         user { "blog":
         groups => apache,
         comment => "Mageia Blog",
-        ensure => present,
-        managehome => true,
         home => "/var/lib/blog",
         }
     }
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp
index eed01d6a..3f5c4705 100644
--- a/modules/buildsystem/manifests/binrepo.pp
+++ b/modules/buildsystem/manifests/binrepo.pp
@@ -12,10 +12,7 @@ class buildsystem {
         $packagers_committers_group = $buildsystem::base::packagers_committers_group
 
         user {"$binrepo_login":
-            ensure => present,
             comment => "Binary files repository",
-            managehome => true,
-            shell => "/bin/bash",
             home => "$binrepo_homedir",
         }
 
diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp
index ab04b3cf..58e67a9f 100644
--- a/modules/buildsystem/manifests/maintdb.pp
+++ b/modules/buildsystem/manifests/maintdb.pp
@@ -9,10 +9,7 @@ class buildsystem {
         $unmaintained = "/var/www/bs/data/unmaintained.txt"
 
         user {"$login":
-            ensure => present,
             comment => "Maintainers database",
-            managehome => true,
-            shell => "/bin/bash",
             home => "$homedir",
         }
 
diff --git a/modules/dashboard/manifests/init.pp b/modules/dashboard/manifests/init.pp
index 3fc3ff67..8bf5479f 100644
--- a/modules/dashboard/manifests/init.pp
+++ b/modules/dashboard/manifests/init.pp
@@ -9,11 +9,8 @@ class dashboard {
 
     class base inherits variable {
         user {"$dashboard_login":
-            ensure => present,
             comment => "dashboard system user",
-            managehome => true,
             home => $dashboard_home_dir,
-            shell => "/bin/bash",
         }
 
 	subversion::snapshot { $dashboard_dir:
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index be53444d..43a57153 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -3,8 +3,6 @@ class planet {
     user { "planet":
         groups => apache,
         comment => "Planet Mageia",
-        ensure => present,
-        managehome => true,
         home => "/var/lib/planet",
     }
 
diff --git a/modules/youri-check/manifests/init.pp b/modules/youri-check/manifests/init.pp
index 3e505287..ba84b5c0 100644
--- a/modules/youri-check/manifests/init.pp
+++ b/modules/youri-check/manifests/init.pp
@@ -8,8 +8,6 @@ class youri-check {
 
         user { $user:
             comment => 'Youri Check',
-            ensure => present,
-            managehome => true,
             home => $home,
         }