[X2Go-Commits] x2gobroker.git - master (branch) updated: 0.0.2.3-137-g03f920d

[X2Go dev team]

The branch, master has been updated
       via  03f920d85e476e22b49a10a665f1064494abd02a (commit)
      from  8044a7866409621d72fed6ddcd3c496c1f7acbbe (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 03f920d85e476e22b49a10a665f1064494abd02a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Dec 20 16:24:28 2013 +0100

    Provide PAM config file for Debian and RHEL separately (as they differ).

-----------------------------------------------------------------------

Summary of changes:
 Makefile                              |    6 +++---
 debian/changelog                      |    1 +
 pam/{x2gobroker => x2gobroker.Debian} |    0
 pam/x2gobroker.RHEL                   |    2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename pam/{x2gobroker => x2gobroker.Debian} (100%)
 create mode 100644 pam/x2gobroker.RHEL

The diff of changes is:
diff --git a/Makefile b/Makefile
index c48277d..6693600 100755
--- a/Makefile
+++ b/Makefile
@@ -79,14 +79,14 @@ install:
 	python setup.py install --prefix="${PREFIX}" $${DESTDIR+--root="${DESTDIR}"}
 	mkdir -p "${DESTDIR}${ETCDIR}/broker" "${DESTDIR}/etc/pam.d" \
 	        "${DESTDIR}/etc/default"
-	${INSTALL_FILE} defaults/python-x2gobroker.default \
+	if [ -e /etc/debian_version ]; then ${INSTALL_FILE} defaults/python-x2gobroker.default \
 	        "${DESTDIR}/etc/default/python-x2gobroker"
 	${INSTALL_FILE} etc/x2gobroker.conf "${DESTDIR}${ETCDIR}/"
 	${INSTALL_FILE} etc/broker/x2gobroker-sessionprofiles.conf \
 	        etc/broker/x2gobroker-loggers.conf \
 	        "${DESTDIR}${ETCDIR}/broker/"
-	mkdir -p "${DESTDIR}/etc/pam.d"
-	${INSTALL_FILE} pam/x2gobroker "${DESTDIR}/etc/pam.d/"
+	if [ -e /etc/debian_version ]; then ${INSTALL_FILE} pam/x2gobroker.Debian "${DESTDIR}/etc/pam.d/x2gobroker"; fi
+	if [ -e /etc/redhat-release ]; then ${INSTALL_FILE} pam/x2gobroker.RHEL "${DESTDIR}/etc/pam.d/x2gobroker"; fi
 	
 	# x2gobroker-agent
 	mkdir -p "${DESTDIR}${LIBDIR}" "${DESTDIR}${SBINDIR}" \
diff --git a/debian/changelog b/debian/changelog
index 8d2158a..b99fdb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Detect RUNDIR in x2gobroker Python module and use it for the default
       location of the authservice socket file.
     - Let x2gobroker-authservice take care of tidying up its own socket file.
+    - Provide PAM config file for Debian and RHEL separately (as they differ).
   * debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Fix SYNOPSIS texts.
diff --git a/pam/x2gobroker b/pam/x2gobroker.Debian
similarity index 100%
rename from pam/x2gobroker
rename to pam/x2gobroker.Debian
diff --git a/pam/x2gobroker.RHEL b/pam/x2gobroker.RHEL
new file mode 100644
index 0000000..15553f9
--- /dev/null
+++ b/pam/x2gobroker.RHEL
@@ -0,0 +1,2 @@
+auth include system-auth
+password include system-auth


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).