Merge lp:~vagrantc/ltsp/ltsp-pam-examples into lp:~sbalneav/ltsp/ltsp-pam-examples

Proposed by Vagrant Cascadian
Status: Needs review
Proposed branch: lp:~vagrantc/ltsp/ltsp-pam-examples
Merge into: lp:~sbalneav/ltsp/ltsp-pam-examples
Diff against target: 223 lines (+142/-9)
13 files modified
debian/changelog (+42/-0)
debian/compat (+1/-0)
debian/control (+22/-0)
debian/copyright (+27/-0)
debian/ltsp-pam.install (+12/-0)
debian/ltsp-pam.links (+1/-0)
debian/rules (+10/-0)
debian/source/format (+1/-0)
ltsp-pam/50-display-manager-pam (+9/-8)
ltsp-pam/ltsp_config.d/50-display-manager-pam (+4/-0)
ltsp-pam/open_session/00-sshfs (+5/-0)
ltsp-pam/screen.d/null (+4/-0)
ltsp-pam/xsession (+4/-1)
To merge this branch: bzr merge lp:~vagrantc/ltsp/ltsp-pam-examples
Reviewer Review Type Date Requested Status
Alkis Georgopoulos (community) Disapprove
Scott Balneaves Pending
Review via email: mp+193820@code.launchpad.net

Description of the change

debian packaging
support for sshfs homedirs
support for localapps

To post a comment you must log in.
lp:~vagrantc/ltsp/ltsp-pam-examples updated
20. By Vagrant Cascadian

Add versioned dependency on ltsp-client-core >= 5.4.6~ to ensure needed
patches in ltsp-localappsd.

21. By Vagrant Cascadian

new uploaded version.

22. By Vagrant Cascadian

Write stdout/stderr to user's .xsession-errors file.

23. By Vagrant Cascadian

Remove cruft from debian/rules.

24. By Vagrant Cascadian

Reorganize dependency lines.

25. By Vagrant Cascadian

Add dependency on net-tools, as xsession uses netstat.

26. By Vagrant Cascadian

Workaround empty close_session dir, by creating in debian/rules.

27. By Vagrant Cascadian

ltsp-pam 0.1~20141007~1-1

Revision history for this message
Alkis Georgopoulos (alkisg) wrote :

I'm setting the state of old merge requests that have been stale for years, to rejected; if someone wants, he can do another merge request in git format, since now ltsp uses git.

review: Disapprove

Unmerged revisions

27. By Vagrant Cascadian

ltsp-pam 0.1~20141007~1-1

26. By Vagrant Cascadian

Workaround empty close_session dir, by creating in debian/rules.

25. By Vagrant Cascadian

Add dependency on net-tools, as xsession uses netstat.

24. By Vagrant Cascadian

Reorganize dependency lines.

23. By Vagrant Cascadian

Remove cruft from debian/rules.

22. By Vagrant Cascadian

Write stdout/stderr to user's .xsession-errors file.

21. By Vagrant Cascadian

new uploaded version.

20. By Vagrant Cascadian

Add versioned dependency on ltsp-client-core >= 5.4.6~ to ensure needed
patches in ltsp-localappsd.

19. By Vagrant Cascadian

remove debian patch to set the default xsession.

18. By Vagrant Cascadian

Switch xsession to use x-session-manager alternative instead of mate-session.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2014-10-07 19:11:26 +0000
@@ -0,0 +1,42 @@
1ltsp-pam (0.1~20141007~1-1) UNRELEASED; urgency=medium
2
3 * Workaround empty close_session dir, by creating in debian/rules.
4 * Write stdout/stderr to user's .xsession-errors file.
5 * Remove cruft from debian/rules.
6 * Reorganize dependency lines.
7 * Add dependency on net-tools, as xsession uses netstat.
8 * Workaround empty close_session dir, by creating in debian/rules.
9
10 -- Vagrant Cascadian <vagrant@debian.org> Tue, 07 Oct 2014 10:36:08 -0700
11
12ltsp-pam (0.1~20131105~1-1) UNRELEASED; urgency=low
13
14 * Remove debian patch to set the default xsession, applied upstream.
15 * Start ltsp-localappsd from xsession wrapper.
16 - Add versioned dependency on ltsp-client-core >= 5.4.6~
17 * Add hook to open_session to mount homedir over sshfs.
18
19 -- Vagrant Cascadian <vagrant@debian.org> Tue, 05 Nov 2013 16:46:06 -0500
20
21ltsp-pam (0.1~20130325~1-1) UNRELEASED; urgency=low
22
23 * New upstream version:
24 - Changed lightdm hooks to be more display manager independent.
25 * Allow gdm3 or any package providing x-display-manager in dependencies.
26
27 -- Vagrant Cascadian <vagrant@debian.org> Mon, 25 Mar 2013 14:37:12 -0700
28
29ltsp-pam (0.1~20130324~1-3) unreleased; urgency=low
30
31 * Install xsession script in the correct place.
32 * Patch xsession script to use x-session-manager instead of harding MATE.
33 * Install ltsp-cleanup.sh in examples dir, since it's meant to be run from
34 the server.
35
36 -- Vagrant Cascadian <vagrant@debian.org> Sun, 24 Mar 2013 11:28:58 -0700
37
38ltsp-pam (0.1~20130324~1-1) unstable; urgency=low
39
40 * Initial release.
41
42 -- Vagrant Cascadian <vagrant@debian.org> Sun, 24 Mar 2013 08:01:44 -0700
043
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2014-10-07 19:11:26 +0000
@@ -0,0 +1,1 @@
18
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2014-10-07 19:11:26 +0000
@@ -0,0 +1,22 @@
1Source: ltsp-pam
2Section: misc
3Priority: extra
4Maintainer: Vagrant Cascadian <vagrant@debian.org>
5Build-Depends: debhelper (>= 8.0.0)
6Standards-Version: 3.9.3
7Homepage: https://code.launchpad.net/~sbalneav/ltsp/ltsp-pam-examples
8#Vcs-Git: git://git.debian.org/collab-maint/ltsp-pam.git
9#Vcs-Browser: http://git.debian.org/?p=collab-maint/ltsp-pam.git;a=summary
10
11Package: ltsp-pam
12Architecture: all
13Depends: ${shlibs:Depends}, ${misc:Depends},
14 daemon,
15 libnss-extrausers,
16 libpam-sshauth (>= 0.3),
17 lightdm | gdm3 | x-display-manager,
18 ltsp-client-core (>= 5.4.6~),
19 net-tools,
20Description: proof of concept scripts to enable LTSP pam support
21 Proof of concept support for using libpam-sshauth and lightdm to replace the
22 core functionality of LDM.
023
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2014-10-07 19:11:26 +0000
@@ -0,0 +1,27 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ltsp-pam
3Source: https://code.launchpad.net/~sbalneav/ltsp/ltsp-pam-examples
4
5Files: *
6Copyright: 2013 Scott Balneaves <sbalneav@ltsp.org>
7License: sbalneav
8 Scotty is usually pretty permissive.
9
10Files: debian/*
11Copyright: 2013 Vagrant Cascadian <vagrant@debian.org>
12License: GPL-2+
13 This package is free software; you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or
16 (at your option) any later version.
17 .
18 This package is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details.
22 .
23 You should have received a copy of the GNU General Public License
24 along with this program. If not, see <http://www.gnu.org/licenses/>
25 .
26 On Debian systems, the complete text of the GNU General
27 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
028
=== added file 'debian/ltsp-pam.install'
--- debian/ltsp-pam.install 1970-01-01 00:00:00 +0000
+++ debian/ltsp-pam.install 2014-10-07 19:11:26 +0000
@@ -0,0 +1,12 @@
1ltsp-pam/auth /usr/share/ltsp-pam/
2ltsp-pam/cleanup /usr/share/ltsp-pam/
3ltsp-pam/close_session /usr/share/ltsp-pam/
4ltsp-pam/ltsp.desktop /usr/share/xsessions/
5ltsp-pam/ltsp-session /usr/share/ltsp-pam/
6ltsp-pam/open_session /usr/share/ltsp-pam/
7ltsp-pam/50-display-manager-pam /usr/share/ltsp/init-ltsp.d/
8ltsp-pam/50-update-nss /usr/share/ltsp/init-ltsp.d/
9ltsp-pam/ltsp-cleanup.sh /usr/share/doc/ltsp-pam/examples/
10ltsp-pam/ltsp_config.d/ /usr/share/ltsp/
11ltsp-pam/screen.d/ /usr/share/ltsp/
12ltsp-pam/xsession /etc/ltsp-pam/
013
=== added file 'debian/ltsp-pam.links'
--- debian/ltsp-pam.links 1970-01-01 00:00:00 +0000
+++ debian/ltsp-pam.links 2014-10-07 19:11:26 +0000
@@ -0,0 +1,1 @@
1/etc/ltsp-pam/xsession /usr/share/ltsp-pam/xsession
02
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2014-10-07 19:11:26 +0000
@@ -0,0 +1,10 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3
4%:
5 dh $@
6
7override_dh_install:
8 # workaround empty close_session dir.
9 mkdir -p debian/tmp/ltsp-pam/close_session
10 dh_install
011
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2014-10-07 19:11:26 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== renamed file 'ltsp-pam/50-lightdm-pam' => 'ltsp-pam/50-display-manager-pam'
--- ltsp-pam/50-lightdm-pam 2013-03-13 00:43:40 +0000
+++ ltsp-pam/50-display-manager-pam 2014-10-07 19:11:26 +0000
@@ -1,8 +1,9 @@
1echo "auth required pam_sshauth.so debug host=server nostrict shm_askpass" > /etc/pam.d/lightdm1pamdm=/etc/pam.d/$(basename ${DEFAULT_DISPLAY_MANAGER:-"lightdm"})
2echo "auth required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> /etc/pam.d/lightdm2echo "auth required pam_sshauth.so debug host=server nostrict shm_askpass" > "$pamdm"
3echo "account required pam_permit.so" >> /etc/pam.d/lightdm3echo "auth required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> "$pamdm"
4echo "session required pam_sshauth.so debug host=server nostrict shm_askpass" >> /etc/pam.d/lightdm4echo "account required pam_permit.so" >> "$pamdm"
5echo "session required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> /etc/pam.d/lightdm5echo "session required pam_sshauth.so debug host=server nostrict shm_askpass" >> "$pamdm"
6echo "session required pam_mkhomedir.so" >> /etc/pam.d/lightdm6echo "session required pam_exec.so debug /usr/share/ltsp-pam/ltsp-session" >> "$pamdm"
7echo "session optional pam_ck_connector.so nox11" >> /etc/pam.d/lightdm7echo "session required pam_mkhomedir.so" >> "$pamdm"
8echo "password required pam_permit.so" >> /etc/pam.d/lightdm8echo "session optional pam_ck_connector.so nox11" >> "$pamdm"
9echo "password required pam_permit.so" >> "$pamdm"
910
=== added directory 'ltsp-pam/ltsp_config.d'
=== added file 'ltsp-pam/ltsp_config.d/50-display-manager-pam'
--- ltsp-pam/ltsp_config.d/50-display-manager-pam 1970-01-01 00:00:00 +0000
+++ ltsp-pam/ltsp_config.d/50-display-manager-pam 2014-10-07 19:11:26 +0000
@@ -0,0 +1,4 @@
1if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
2 # Override removal of display manager init script
3 set_lts_var KEEP_SYSTEM_SERVICES "$KEEP_SYSTEM_SERVICES $(basename $DEFAULT_DISPLAY_MANAGER)"
4fi
05
=== added file 'ltsp-pam/open_session/00-sshfs'
--- ltsp-pam/open_session/00-sshfs 1970-01-01 00:00:00 +0000
+++ ltsp-pam/open_session/00-sshfs 2014-10-07 19:11:26 +0000
@@ -0,0 +1,5 @@
1# mount homedir with sshfs.
2# requires user_allow_other in fuse.conf
3rm -rf /home/${PAM_USER}
4mkdir -p /home/${PAM_USER}
5sshfs -o "allow_other,ControlPath=${SOCKET}" ${PAM_SSHAUTH_HOST}:/home/${PAM_USER} /home/${PAM_USER}
06
=== added directory 'ltsp-pam/screen.d'
=== added file 'ltsp-pam/screen.d/null'
--- ltsp-pam/screen.d/null 1970-01-01 00:00:00 +0000
+++ ltsp-pam/screen.d/null 2014-10-07 19:11:26 +0000
@@ -0,0 +1,4 @@
1#!/bin/sh
2
3# Do nothing but sleep *all* day.
4exec sleep $((60*60*24))
05
=== modified file 'ltsp-pam/xsession'
--- ltsp-pam/xsession 2013-03-13 00:00:27 +0000
+++ ltsp-pam/xsession 2014-10-07 19:11:26 +0000
@@ -30,5 +30,8 @@
30 "while read K; do xauth add \${SSH_CLIENT%% *}:0 . \$K; done"30 "while read K; do xauth add \${SSH_CLIENT%% *}:0 . \$K; done"
31 ssh -S ${SKT} -Y ${HST} "DISPLAY=\${SSH_CLIENT%% *}:0 twm"31 ssh -S ${SKT} -Y ${HST} "DISPLAY=\${SSH_CLIENT%% *}:0 twm"
32else32else
33 ssh -S ${SKT} -Y ${HST} "mate-session;ltsp-cleanup.sh"33 # start localapps daemon, which requires ltsp-localappsd to not use su,
34 # since it's already running as the user.
35 LDM_USERNAME=${USER} ltsp-localappsd &
36 ssh -S ${SKT} -Y ${HST} "x-session-manager >> .xsession-errors 2>&1 ; ltsp-cleanup.sh"
34fi37fi

Subscribers

People subscribed via source and target branches