This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 5d8b9b8ad99c3018fafcbf4d00a896e06d4dfab1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 25 12:05:33 2014 +0200 Add logcheck rules for X2Go Server. Thanks to Frank Werner for sending them in. Conflicts (resolved by Mike Gabriel): debian/x2goserver.install --- debian/changelog | 2 ++ debian/x2goserver.install | 1 + x2goserver.spec | 1 + x2goserver/Makefile | 5 +++++ x2goserver/etc/logcheck/ignore.d.server/x2goserver | 4 ++++ 5 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 663a0d3..7265247 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,8 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low the X2Go session DB. - x2golistdesktops: Also detect sharable desktop sessions behind abstract kernel namespace sockets. + - Add logcheck rules for X2Go Server. Thanks to Frank Werner for sending + them in. * debian/control, x2goserver.spec: + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go works with poly-instantiated /tmp directories. diff --git a/debian/x2goserver.install b/debian/x2goserver.install index d8405dd..557d001 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -4,5 +4,6 @@ x2goserver/lib/x2go* /usr/lib/x2go/ x2goserver/etc/x2go_logout* /etc/x2go/ x2goserver/etc/x2goagent.options /etc/x2go/ x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d/ +x2goserver/etc/logcheck/ignore.d.server/x2goserver /etc/logcheck/ignore.d.server/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/x2goserver.spec b/x2goserver.spec index 270ebdb..ed5e7c6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -375,6 +375,7 @@ exit 0 %doc debian/changelog %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver +%config(noreplace) %{_sysconfdir}/logcheck/ignore.d.server/x2goserver %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 43c4304..451e593 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -72,6 +72,8 @@ install_config: $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ $(INSTALL_DIR) $(DESTDIR)/etc/sudoers.d || true $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ + $(INSTALL_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true + $(INSTALL_FILE) etc/logcheck/ignore.d.server/x2goserver $(DESTDIR)/etc/logcheck/ignore.d.server/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -105,6 +107,9 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR) || true $(RM_FILE) $(DESTDIR)/etc/sudoers.d/x2goserver $(RM_DIR) $(DESTDIR)/etc/sudoers.d || true + $(RM_FILE) $(DESTDIR)/etc/logcheck/ignore.d.server/x2goserver + $(RM_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true + $(RM_DIR) $(DESTDIR)/etc/logcheck || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver/etc/logcheck/ignore.d.server/x2goserver b/x2goserver/etc/logcheck/ignore.d.server/x2goserver new file mode 100644 index 0000000..f936d3d --- /dev/null +++ b/x2goserver/etc/logcheck/ignore.d.server/x2goserver @@ -0,0 +1,4 @@ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/bin/x2gomountdirs\[[ 0-9]{1,6}\]: WARNING: mounting of /.*/spool failed$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/bin/x2gosuspend-session: session with ID .* has been suspended successfully$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/bin/x2gostartagent: successfully started X2Go agent session with ID .*$ +^\w{3} [ :0-9]{11} [._[:alnum:]-]+ /usr/bin/x2goresume-session: client .* has successfully resumed session with ID .*$ \ No newline at end of file -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git