diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp index 3ed7cd7..ceaef21 100644 --- a/manifests/main/dirs.pp +++ b/manifests/main/dirs.pp @@ -6,7 +6,7 @@ class confdroid_nagios::main::dirs ( ) inherits confdroid_nagios::params { - require confdroid_nagios::main::user + require confdroid_nagios::main::install # main directory # file { $ng_main_dir: diff --git a/manifests/main/user.pp b/manifests/main/user.pp deleted file mode 100644 index 9aaf9d6..0000000 --- a/manifests/main/user.pp +++ /dev/null @@ -1,30 +0,0 @@ -## confdroid_nagios::main::user.pp -# Module name: confdroid_nagios -# Author: 12ww1160 (12ww1160@confdroid.com) -# @summary Class manages user configuration for the confdroid_nagios module. -############################################################################### -class confdroid_nagios::main::user ( - -) inherits confdroid_nagios::params { - require confdroid_nagios::main::install - - if $ng_nagios_server == $fqdn { - group { $ng_user: - ensure => present, - name => $ng_user, - allowdupe => false, - } - - user { $ng_user: - ensure => present, - name => $ng_user, - allowdupe => false, - comment => $ng_u_comment, - groups => $ng_u_groups, - managehome => true, - home => $ng_u_home, - shell => $ng_u_shell, - require => Group[$ng_user], - } - } -} diff --git a/manifests/params.pp b/manifests/params.pp index 883f1bd..094a907 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -38,13 +38,6 @@ class confdroid_nagios::params ( String $ng_pkg_ensure = 'present', Boolean $ng_include_nrpe = true, -# user - String $ng_user = 'nagios', - String $ng_u_comment = 'Nagios User', - String $ng_u_groups = 'nagios', - String $ng_u_shell = '/sbin/nologin', - String $ng_u_home = '/var/spool/nagios', - # httpd Boolean $ng_use_https = false,