11 files changed, 1 insertions, 11 deletions
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp
index fba81230..fd7f123c 100644
--- a/deployment/mgagit/manifests/init.pp
+++ b/deployment/mgagit/manifests/init.pp
@@ -28,7 +28,6 @@ class mgagit(
   }
   user { $git_login:
     ensure      => present,
-    comment     => 'Mageia Git',
     home        => $git_homedir,
     managehome  => true,
     gid         => $git_login,
diff --git a/deployment/softwarekey/manifests/init.pp b/deployment/softwarekey/manifests/init.pp
index 8035de4c..b2c4bcb2 100644
--- a/deployment/softwarekey/manifests/init.pp
+++ b/deployment/softwarekey/manifests/init.pp
@@ -6,7 +6,6 @@ class softwarekey {
     group { $sign_login: }
 
     user { $sign_login:
-        comment => 'System user to sign Mageia Software',
         home    => $sign_home_dir,
         gid     => $sign_login,
         require => Group[$sign_login],
diff --git a/modules/buildsystem/manifests/binrepo.pp b/modules/buildsystem/manifests/binrepo.pp
index 4c0bf378..7803e385 100644
--- a/modules/buildsystem/manifests/binrepo.pp
+++ b/modules/buildsystem/manifests/binrepo.pp
@@ -9,7 +9,6 @@ class buildsystem::binrepo {
     }
 
     user { $buildsystem::var::binrepo::login:
-        comment => 'Binary files repository',
         home    => $buildsystem::var::binrepo::homedir,
     }
 
diff --git a/modules/buildsystem/manifests/iurt/user.pp b/modules/buildsystem/manifests/iurt/user.pp
index 0da84743..a93ac7e7 100644
--- a/modules/buildsystem/manifests/iurt/user.pp
+++ b/modules/buildsystem/manifests/iurt/user.pp
@@ -3,7 +3,6 @@ class buildsystem::iurt::user {
 
     buildsystem::sshuser { $buildsystem::var::iurt::login:
         homedir => $buildsystem::var::iurt::homedir,
-        comment => 'System user used to run build bots',
     }
 
     file { '/etc/iurt':
diff --git a/modules/buildsystem/manifests/maintdb.pp b/modules/buildsystem/manifests/maintdb.pp
index e531f550..74f8e28c 100644
--- a/modules/buildsystem/manifests/maintdb.pp
+++ b/modules/buildsystem/manifests/maintdb.pp
@@ -5,7 +5,6 @@ class buildsystem::maintdb {
     include sudo
 
     user { $buildsystem::var::maintdb::login:
-        comment => 'Maintainers database',
         home    => $buildsystem::var::maintdb::homedir,
     }
 
diff --git a/modules/buildsystem/manifests/scheduler.pp b/modules/buildsystem/manifests/scheduler.pp
index a0138a2f..000bf0e7 100644
--- a/modules/buildsystem/manifests/scheduler.pp
+++ b/modules/buildsystem/manifests/scheduler.pp
@@ -10,7 +10,6 @@ class buildsystem::scheduler {
 
         buildsystem::sshuser { $login:
             homedir => $homedir,
-            comment => 'System user used to schedule builds',
         }
 
         file { $logdir:
diff --git a/modules/buildsystem/manifests/signbot.pp b/modules/buildsystem/manifests/signbot.pp
index f41254a4..60c7c318 100644
--- a/modules/buildsystem/manifests/signbot.pp
+++ b/modules/buildsystem/manifests/signbot.pp
@@ -5,7 +5,6 @@ class buildsystem::signbot {
 
     sshuser { $buildsystem::var::signbot::login:
         homedir => $buildsystem::var::signbot::home_dir,
-        comment => 'System user used to sign packages',
         groups  => [$sched_login],
     }
 
diff --git a/modules/buildsystem/manifests/sshuser.pp b/modules/buildsystem/manifests/sshuser.pp
index 4dcf51d5..5cad97ad 100644
--- a/modules/buildsystem/manifests/sshuser.pp
+++ b/modules/buildsystem/manifests/sshuser.pp
@@ -1,5 +1,5 @@
 # $groups: array of secondary groups (only local groups, no ldap)
-define buildsystem::sshuser($homedir, $comment, $groups = []) {
+define buildsystem::sshuser($homedir, $comment = undef, $groups = []) {
     group { $name: }
 
     user { $name:
diff --git a/modules/mga-advisories/manifests/init.pp b/modules/mga-advisories/manifests/init.pp
index 56929b6a..1937bb62 100644
--- a/modules/mga-advisories/manifests/init.pp
+++ b/modules/mga-advisories/manifests/init.pp
@@ -17,7 +17,6 @@ class mga-advisories(
 
   user { $mgaadv_login:
     ensure     => present,
-    comment    => 'mga-advisories user',
     home       => $mgaadv_homedir,
     managehome => true,
     gid        => $mgaadv_login,
diff --git a/modules/mgasoft/manifests/init.pp b/modules/mgasoft/manifests/init.pp
index 956ea978..70431701 100644
--- a/modules/mgasoft/manifests/init.pp
+++ b/modules/mgasoft/manifests/init.pp
@@ -8,7 +8,6 @@ class mgasoft(
     group { $mgasoft_login: }
 
     user { $mgasoft_login:
-        comment    => 'System user to publish software',
         managehome => true,
         home       => "/var/lib/${mgasoft_login}",
         gid        => $mgasoft_login,
diff --git a/modules/mirror/manifests/base.pp b/modules/mirror/manifests/base.pp
index 7470547d..db48f808 100644
--- a/modules/mirror/manifests/base.pp
+++ b/modules/mirror/manifests/base.pp
@@ -10,7 +10,6 @@ class mirror::base {
     group { 'mirror': }
 
     user { 'mirror':
-        comment => 'System user use to run mirror scripts',
         gid     => 'mirror',
     }
 }