From cc3ae2aca6735a91eebc0c7e3c769ac79f29e894 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Sat, 27 Apr 2024 00:46:21 -0500 Subject: [PATCH] (maint) silence usermod: no changes message --- .../lein-ezbake/template/global/ext/debian/preinst.erb | 2 +- .../lein-ezbake/template/global/ext/redhat/preinst.erb | 2 +- resources/puppetlabs/lein-ezbake/template/global/install.sh.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/debian/preinst.erb b/resources/puppetlabs/lein-ezbake/template/global/ext/debian/preinst.erb index d69e179e..b3c5c12e 100644 --- a/resources/puppetlabs/lein-ezbake/template/global/ext/debian/preinst.erb +++ b/resources/puppetlabs/lein-ezbake/template/global/ext/debian/preinst.erb @@ -14,7 +14,7 @@ if [ "$1" = install ] || [ "$1" = upgrade ]; then if getent passwd <%= EZBake::Config[:user] %> > /dev/null; then usermod --gid <%= EZBake::Config[:group] %> \ --home /opt/puppetlabs/server/data/<%= EZBake::Config[:real_name] %> \ - --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> || : + --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> > /dev/null || : else useradd -r --gid <%= EZBake::Config[:group] %> \ --home /opt/puppetlabs/server/data/<%= EZBake::Config[:real_name] %> --shell $(which nologin) \ diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/redhat/preinst.erb b/resources/puppetlabs/lein-ezbake/template/global/ext/redhat/preinst.erb index 0b985645..c7dabefb 100644 --- a/resources/puppetlabs/lein-ezbake/template/global/ext/redhat/preinst.erb +++ b/resources/puppetlabs/lein-ezbake/template/global/ext/redhat/preinst.erb @@ -11,7 +11,7 @@ getent group <%= EZBake::Config[:group] %> >/dev/null || groupadd --system --for # Add <%= EZBake::Config[:user] %> user if getent passwd <%= EZBake::Config[:user] %> > /dev/null; then usermod --gid <%= EZBake::Config[:group] %> --home %{_app_data} \ - --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> || : + --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> > /dev/null || : else useradd_options=('--system' '--gid' '<%= EZBake::Config[:group] %>' '--home' '%{_app_data}' '--shell' "$(which nologin)" '--comment' '<%= EZBake::Config[:project] %> daemon') <% unless EZBake::Config[:numeric_uid_gid].nil? -%> diff --git a/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb b/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb index e460d680..26109638 100755 --- a/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb +++ b/resources/puppetlabs/lein-ezbake/template/global/install.sh.erb @@ -306,7 +306,7 @@ function task_service_account { # Add or update <%= EZBake::Config[:user] %> user if getent passwd <%= EZBake::Config[:user] %> > /dev/null; then usermod --gid <%= EZBake::Config[:group] %> --home "${app_data}" \ - --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> || : + --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> > /dev/null || : else useradd -r --gid <%= EZBake::Config[:group] %> --home "${app_data}" --shell $(which nologin) \ --comment "<%= EZBake::Config[:project] %> daemon" <%= EZBake::Config[:user] %> || :