This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 5235190 Make sure that without configuration files, the HTTP broker listens to port 8080. new f719431 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. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 1 + debian/changelog | 3 +++ x2gobroker.spec | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit f719431536a1e8aebb1fd9e185fed9e78d1e1511 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Oct 28 18:08:39 2014 +0100 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. --- Makefile | 1 + debian/changelog | 3 +++ x2gobroker.spec | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 37d4c9b..7c3b6a6 100755 --- a/Makefile +++ b/Makefile @@ -81,6 +81,7 @@ install: ${INSTALL_FILE} defaults/python-x2gobroker.default \ "${DESTDIR}/etc/default/python-x2gobroker" ${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/" + ${INSTALL_FILE} etc/broker/defaults.conf "${DESTDIR}${ETCDIR}/broker/" ${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf "${DESTDIR}${ETCDIR}/broker/" ${INSTALL_FILE} etc/broker/x2gobroker-loggers.conf "${DESTDIR}${ETCDIR}/broker/" if [ -e /etc/debian_version ]; then ${INSTALL_FILE} pam/x2gobroker.Debian "${DESTDIR}/etc/pam.d/x2gobroker"; fi diff --git a/debian/changelog b/debian/changelog index 1cb02b0..9bfaa0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -210,6 +210,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low + On SUSE, we have to provide our own python-pampy package (and depend on that). In Fedora and RHEL, the same (upstream) software is named python-pam. (Fixes: #562). + + 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. [ Josh Lukens ] * New upstream version (0.0.3.0): diff --git a/x2gobroker.spec b/x2gobroker.spec index e88424e..4853f03 100644 --- a/x2gobroker.spec +++ b/x2gobroker.spec @@ -369,6 +369,7 @@ rm -f %{buildroot}%{_sysconfdir}/default/x2gobroker-authservice %else # SysV session cleanup script %if 0%{?el5} +rm -f %{buildroot}%{_sysconfdir}/x2go/broker/defaults.conf mkdir -p %{buildroot}%{_initrddir} install -pm0755 %SOURCE2 \ "$b/%_initrddir/x2gobroker-authservice" @@ -376,6 +377,7 @@ install -pm0755 %SOURCE1 \ "$b/%_initrddir/x2gobroker-daemon" %endif %if 0%{?el6} || ( 0%{?suse_version} && 0%{?suse_version} < 1140) +rm -f %{buildroot}%{_sysconfdir}/x2go/broker/defaults.conf mkdir -p "$b/%_initddir" install -pm0755 %SOURCE2 \ "$b/%_initddir/x2gobroker-authservice" @@ -612,8 +614,9 @@ fi %endif %if 0%{?fedora} || 0%{?el7} || 0%{?suse_version} >= 1230 %{_unitdir}/x2gobroker-daemon.service +%config %_sysconfdir/x2go/broker/defaults.conf %endif -%if 0%{?el5} || 0%{?el6} +%if 0%{?el5} || 0%{?el6} || 0%{?suse_version} < 1140 %config %_sysconfdir/default/x2gobroker-daemon %endif %_sbindir/x2gobroker-daemon-debug -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org