[Cipux-devel] Bug#734725: cipux: update documentation to cope with www-data having a non-login shell

[Colin Watson]

Package: cipux
Version: 3.4.0.13-4
Severity: minor
Tags: patch
User: base-passwd at packages.debian.org
Usertags: shell-fallout

In base-passwd 3.5.30, I changed www-data's shell to /usr/sbin/nologin
(a change that I really should have made about ten years ago).  This has
unfortunately had a bit of collateral damage: the directions given in
cipux' documentation will no longer work.  Here's a fix.

  * Adjust documentation to cope with www-data having a non-login shell.

diff -Nru cipux-3.4.0.13/debian/patches/series cipux-3.4.0.13/debian/patches/series
--- cipux-3.4.0.13/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ cipux-3.4.0.13/debian/patches/series	2014-01-09 12:21:12.000000000 +0000
@@ -0,0 +1 @@
+su-shell.patch
diff -Nru cipux-3.4.0.13/debian/patches/su-shell.patch cipux-3.4.0.13/debian/patches/su-shell.patch
--- cipux-3.4.0.13/debian/patches/su-shell.patch	1970-01-01 01:00:00.000000000 +0100
+++ cipux-3.4.0.13/debian/patches/su-shell.patch	2014-01-09 12:22:43.000000000 +0000
@@ -0,0 +1,49 @@
+Description: Cope with www-data having a non-login shell
+Author: Colin Watson <cjwatson at debian.org>
+Forwarded: no
+Last-Update: 2014-01-09
+
+Index: b/doc/install/debian/catweb_deb_pkg_installation.mkd
+===================================================================
+--- a/doc/install/debian/catweb_deb_pkg_installation.mkd
++++ b/doc/install/debian/catweb_deb_pkg_installation.mkd
+@@ -41,14 +41,14 @@
+ List all unregistered CAT modules to see what is available. Use cipadmin as
+ login and the password you have used for cipadmin while installing CipUX.
+ 
+-    su -l www-data -c 'cipux_cat_web_module --list-deregistered'
++    su -l www-data -s /bin/sh -c 'cipux_cat_web_module --list-deregistered'
+ 
+ The next step is to _register_ and _enable_ the modules you want to use. In any
+ case you should register index.cgi to see the first page of CAT. As an example
+ we also register language.cgi as the second module.
+ 
+-    su -l www-data -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object index.cgi'
+-    su -l www-data -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object language.cgi'
++    su -l www-data -s /bin/sh -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object index.cgi'
++    su -l www-data -s /bin/sh -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object language.cgi'
+ 
+ # First steps
+ 
+Index: b/doc/install/debian/catweb_release_installation.mkd
+===================================================================
+--- a/doc/install/debian/catweb_release_installation.mkd
++++ b/doc/install/debian/catweb_release_installation.mkd
+@@ -32,14 +32,14 @@
+ List all unregistered CAT modules to see what is available. Use cipadmin as
+ login and the password you have used for cipadmin while installing CipUX.
+ 
+-    su -l www-data -c 'cipux_cat_web_module --list-deregistered'
++    su -l www-data -s /bin/sh -c 'cipux_cat_web_module --list-deregistered'
+ 
+ The next step is to _register_ and _enable_ the modules you want to use. In any
+ case you should register index.cgi to see the first page of CAT. As an example
+ we also register language.cgi as the second module.
+ 
+-    su -l www-data -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object index.cgi'
+-    su -l www-data -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object language.cgi'
++    su -l www-data -s /bin/sh -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object index.cgi'
++    su -l www-data -s /bin/sh -c 'cipux_cat_web_module --register --enable --add-member admins --verbose --object language.cgi'
+ 
+ ## First steps
+ 

Sorry,

-- 
Colin Watson                                       [cjwatson at debian.org]