The branch, master has been updated via a0f366f95b7d6ec9f7db19aafb72bc701a2ef973 (commit) from 6be9325b9a303a3c923d4135c6385fb3ae310699 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a0f366f95b7d6ec9f7db19aafb72bc701a2ef973 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Dec 18 23:34:25 2013 +0100 x2gobroker.spec: slightly modify x2gobroker user creation ----------------------------------------------------------------------- Summary of changes: rpm/x2gobroker-authservice.init | 2 +- x2gobroker.spec | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/rpm/x2gobroker-authservice.init b/rpm/x2gobroker-authservice.init index cfba2dc..710da2c 100644 --- a/rpm/x2gobroker-authservice.init +++ b/rpm/x2gobroker-authservice.init @@ -36,7 +36,7 @@ if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then X2GOBROKER_DAEMON_USER=nobody fi if ! getent group $X2GOBROKER_DAEMON_GROUP 1>/dev/null 2>/dev/null; then - X2GOBROKER_DAEMON_GROUP=nogroup + X2GOBROKER_DAEMON_GROUP=nobody fi export X2GOBROKER_DEBUG diff --git a/x2gobroker.spec b/x2gobroker.spec index d64eed3..4b3ee27 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -245,9 +245,9 @@ install -pm0755 "init/x2gobroker-daemon.init" \ %endif %pre -if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then - /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ - /usr/sbin/useradd -c "x2go broker server/user" \ +if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then + /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ + /usr/sbin/useradd -c "X2Go Broker System User" \ -d "%_localstatedir/lib/x2gobroker" \ -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; @@ -314,10 +314,9 @@ fi %pre agent -if ! /usr/bin/getent group x2gobroker >/dev/null 2>/dev/null && \ - /usr/sbin/groupadd -r x2gobroker; then - /usr/bin/getent passwd x2gobroker >/dev/null 2>/dev/null || \ - /usr/sbin/useradd -c "x2go broker server/user" \ +if ! /usr/bin/getent group x2gobroker 1>/dev/null 2>/dev/null && /usr/sbin/groupadd -r x2gobroker; then + /usr/bin/getent passwd x2gobroker 1>/dev/null 2>/dev/null || \ + /usr/sbin/useradd -c "X2Go Broker System User" \ -d "%_localstatedir/lib/x2gobroker" \ -g x2gobroker -r -s /bin/bash x2gobroker || :; fi; hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).