[tomcat8] 01/01: Changed the home directory for the tomcat8 user to /var/lib/tomcat8 (Closes: #833261)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch experimental
in repository tomcat8.

commit 0a7e74a658aa3f91f17a7fb447647aac62b345bb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 1 12:20:45 2016 +0100

    Changed the home directory for the tomcat8 user to /var/lib/tomcat8 (Closes: #833261)
---
 debian/changelog        | 2 ++
 debian/tomcat8.init     | 3 +++
 debian/tomcat8.postinst | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index afe55fa..ffbe510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ tomcat8 (8.5.8-2) UNRELEASED; urgency=medium
     (Closes: #845661)
   * Added the delaycompress option to the logrotate configuration
     of catalina.out (Closes: #843135)
+  * Changed the home directory for the tomcat8 user from /usr/share/tomcat8
+    to /var/lib/tomcat8 (Closes: #833261)
   * Set the proper permissions for /etc/tomcat8/jaspic-providers.xml
   * Install the new library jaspic-api.jar
   * Install the Maven artifacts for tomcat-storeconfig
diff --git a/debian/tomcat8.init b/debian/tomcat8.init
index ada099d..4fe223a 100644
--- a/debian/tomcat8.init
+++ b/debian/tomcat8.init
@@ -194,6 +194,9 @@ case "$1" in
 		exit 1
 	fi
 
+	# Change the home directory to /var/lib/tomcat8 for older installations (to be removed in tomcat9)
+	usermod --home /var/lib/tomcat8 $TOMCAT8_USER > /dev/null 2>&1 || true
+
 	log_daemon_msg "Starting $DESC" "$NAME"
 	if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
 		--user $TOMCAT8_USER --exec "$JAVA_HOME/bin/java" \
diff --git a/debian/tomcat8.postinst b/debian/tomcat8.postinst
index a4003a5..5600706 100644
--- a/debian/tomcat8.postinst
+++ b/debian/tomcat8.postinst
@@ -31,7 +31,7 @@ case "$1" in
 	    addgroup --system "$TOMCAT8_GROUP" --quiet
 	fi
 	if ! id $TOMCAT8_USER > /dev/null 2>&1 ; then
-	    adduser --system --home /usr/share/tomcat8 --no-create-home \
+	    adduser --system --home /var/lib/tomcat8 --no-create-home \
 		--ingroup "$TOMCAT8_GROUP" --disabled-password --shell /bin/false \
 		"$TOMCAT8_USER"
 	fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git