Merge branch 'master' into 7370-package-install-testing

[arvados-dev.git] / jenkins / arvados-sso-server-extras / arvados-sso-server.postinst

diff --git a/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst b/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst
index ecd9b4487077828e46a04f41eec4258ea650edeb..436f5bdaf617b6408c4d8ee234b5bce096ce59fd 100755 (executable)
--- a/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst
+++ b/jenkins/arvados-sso-server-extras/arvados-sso-server.postinst
@@ -6,6 +6,7 @@ INSTALL_PATH=/var/www/arvados-sso
 RELEASE_PATH=$INSTALL_PATH/current
 SHARED_PATH=$INSTALL_PATH/shared
 CONFIG_PATH=/etc/arvados/sso
+PACKAGE_NAME=arvados-sso-server
 
 DATABASE_READY=1
 APPLICATION_READY=1
@@ -78,8 +79,8 @@ EOF
 
   echo
   echo "Assumption: $WEB_SERVICE is configured to serve your SSO server URL from"
-  echo "            /var/www/arvados-sso/current"
-  echo "Assumption: configuration files are in /etc/arvados/sso/"
+  echo "            $RELEASE_PATH"
+  echo "Assumption: configuration files are in $CONFIG_PATH"
   echo "Assumption: $WEB_SERVICE and passenger run as $WWW_OWNER"
   echo
 
@@ -211,8 +212,8 @@ if [ "$DATABASE_READY" = "0" ]; then
 
 PLEASE NOTE:
 
-The arvados-sso package was not configured completely because
-/etc/arvados/database.yml needs some tweaking. Please refer to the
+The $PACKAGE_NAME package was not configured completely because
+$CONFIG_PATH/database.yml needs some tweaking. Please refer to the
 documentation at http://doc.arvados.org/install/install-sso.html#configure for
 more details.
 
@@ -225,8 +226,8 @@ if [ "$APPLICATION_READY" = "0" ]; then
 
 PLEASE NOTE:
 
-The arvados-sso package was not configured completely because
-/etc/arvados/application.yml needs some tweaking. Please refer to the
+The $PACKAGE_NAME package was not configured completely because
+$CONFIG_PATH/application.yml needs some tweaking. Please refer to the
 documentation at http://doc.arvados.org/install/install-sso.html#configure for
 more details.