[X2Go-Commits] [x2gobroker] 01/02: No adm group on non-Debian systems by default. Using root instead on RPM based systems.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 15aeeb6d7f979907ae29042c5e3f4dd4d9fc0cda
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 28 23:27:43 2014 +0100

    No adm group on non-Debian systems by default. Using root instead on RPM based systems.
---
 debian/changelog                 |    2 ++
 logrotate/x2gobroker-authservice |    2 +-
 x2gobroker.spec                  |    6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3f6e4ad..b293f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -216,6 +216,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     + For distro versions with systemd, provide /etc/x2go/broker/defaults.conf.
       For SysV distro versions, use /etc/defaults/* and source them via the
       init scripts.
+    + No adm group on non-Debian systems by default. Using root instead on RPM
+      based systems.
 
   [ Josh Lukens ]
   * New upstream version (0.0.3.0):
diff --git a/logrotate/x2gobroker-authservice b/logrotate/x2gobroker-authservice
index a2f499c..56a92eb 100644
--- a/logrotate/x2gobroker-authservice
+++ b/logrotate/x2gobroker-authservice
@@ -6,7 +6,7 @@
 	delaycompress
 	notifempty
 	create 640 root adm
-	su x2gobroker adm
+	su root adm
 	sharedscripts
 	postrotate
 		invoke-rc.d x2gobroker-authservice restart > /dev/null
diff --git a/x2gobroker.spec b/x2gobroker.spec
index c62a69b..0307812 100644
--- a/x2gobroker.spec
+++ b/x2gobroker.spec
@@ -335,6 +335,12 @@ sed -i etc/broker/x2gobroker-sessionprofiles.conf \
     -e 's/^name=MATE - localhost/name=GNOME - localhost/' \
     -e 's/^command=MATE/command=GNOME/'
 %endif
+sed -i logrotate/x2gobroker-authservice \
+    -e 's/adm/root/'
+sed -i logrotate/x2gobroker-daemon \
+    -e 's/adm/root/'
+sed -i logrotate/x2gobroker-wsgi \
+    -e 's/adm/root/'
 make %{?_smp_mflags} PREFIX="%_prefix" LIBDIR="%_libexecdir/x2go"
 
 %install

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git