Remove agent user and group parameters

Since Puppet 4 the agent runs as root and the package doesn't create the
user & group anymore. Only the server runs as a limited user. This means
the parameters are no longer needed.

Author: ekohl

manifests/init.pp

@@ -111,10 +111,6 @@
 #                                           read after the elapsed interval then the
 #                                           connection will be closed.
 #
-# $user::                                   Override the name of the puppet user.
-#
-# $group::                                  Override the name of the puppet group.
-#
 # $dir::                                    Override the puppet directory.
 #
 # $codedir::                                Override the puppet code directory.
@@ -558,8 +554,6 @@
 #
 class puppet (
   String $version = $puppet::params::version,
-  String $user = $puppet::params::user,
-  String $group = $puppet::params::group,
   Stdlib::Absolutepath $dir = $puppet::params::dir,
   Stdlib::Absolutepath $codedir = $puppet::params::codedir,
   Stdlib::Absolutepath $vardir = $puppet::params::vardir,
@@ -625,8 +619,8 @@
   Boolean $server = $puppet::params::server,
   Array[String] $server_admin_api_whitelist = $puppet::params::server_admin_api_whitelist,
   Boolean $server_manage_user = $puppet::params::manage_user,
-  String $server_user = $puppet::params::user,
-  String $server_group = $puppet::params::group,
+  String $server_user = $puppet::params::server_user,
+  String $server_group = $puppet::params::server_group,
   String $server_dir = $puppet::params::dir,
   String $server_ip = $puppet::params::ip,
   Stdlib::Port $server_port = $puppet::params::port,

manifests/params.pp

@@ -5,8 +5,8 @@
   # Basic config
   $version             = 'present'
   $manage_user         = true
-  $user                = 'puppet'
-  $group               = 'puppet'
+  $server_user         = 'puppet'
+  $server_group        = 'puppet'
   $ip                  = '0.0.0.0'
   $port                = 8140
   $splay               = false
@@ -225,7 +225,7 @@
 
   # Owner of the environments dir: for cases external service needs write
   # access to manage it.
-  $server_environments_owner   = $user
+  $server_environments_owner   = $server_user
   $server_environments_group   = $root_group
   $server_environments_mode    = '0755'
   # Where we store our puppet environments
@@ -240,9 +240,9 @@
   # mode of the repository
   $server_git_repo_mode       = '0755'
   # user of the repository
-  $server_git_repo_user       = $user
+  $server_git_repo_user       = $server_user
   # group of the repository
-  $server_git_repo_group      = $user
+  $server_git_repo_group      = $server_group
   # Override these if you need your own hooks
   $server_post_hook_content   = 'puppet/server/post-receive.erb'
   $server_post_hook_name      = 'post-receive'

manifests/server/config.pp

@@ -216,8 +216,8 @@
   if $puppet::server::default_manifest and $puppet::server::default_manifest_content != '' {
     file { $puppet::server::default_manifest_path:
       ensure  => file,
-      owner   => $puppet::user,
-      group   => $puppet::group,
+      owner   => $puppet::server::user,
+      group   => $puppet::server::group,
       mode    => '0644',
       content => $puppet::server::default_manifest_content,
     }