From 4154041de6b8563e48ff22fbbce45437cb42f629 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 30 Jul 2017 15:19:36 +0100 Subject: [PATCH] reversed user change and made sure it always can login --- README.md | 2 +- manifests/main/user.pp | 44 ++++++++++++------------------------------ 2 files changed, 13 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 0525c2e..da046c6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.4 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.5 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. diff --git a/manifests/main/user.pp b/manifests/main/user.pp index 7816837..00a26e7 100644 --- a/manifests/main/user.pp +++ b/manifests/main/user.pp @@ -33,37 +33,17 @@ class cd_nagios::main::user ( allowdupe => false, } - if $::fqdn == $ng_nagios_server { - - user { $ng_user: - ensure => present, - name => $ng_user, - allowdupe => false, - comment => $ng_u_comment, - uid => $ng_u_uid, - gid => $ng_user, - groups => $ng_u_groups, - managehome => true, - home => $ng_user_home, - shell => '/bin/bash', - require => Group[$ng_user], - } - } - - else { - - user { $ng_user: - ensure => present, - name => $ng_user, - allowdupe => false, - comment => $ng_u_comment, - uid => $ng_u_uid, - gid => $ng_user, - groups => $ng_u_groups, - managehome => true, - home => $ng_user_home, - shell => $ng_user_shell, - require => Group[$ng_user], - } + user { $ng_user: + ensure => present, + name => $ng_user, + allowdupe => false, + comment => $ng_u_comment, + uid => $ng_u_uid, + gid => $ng_user, + groups => $ng_u_groups, + managehome => true, + home => $ng_user_home, + shell => $ng_user_shell, + require => Group[$ng_user], } }