[cpp-sp] branch master updated: Sample init script cleanup.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=7c880dd422c814b2165e21a3e41cc324eb3222c4

The following commit(s) were added to refs/heads/master by this push:
       new  7c880dd   Sample init script cleanup.
7c880dd is described below

commit 7c880dd422c814b2165e21a3e41cc324eb3222c4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Jun 8 11:32:56 2018 -0400

    Sample init script cleanup.
---
 configs/shibd-debian.in    | 4 ++--
 configs/shibd-osx.plist.in | 4 ++--
 configs/shibd-redhat.in    | 6 +++---
 configs/shibd-suse.in      | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 37efca4..5149314 100644
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -5,7 +5,7 @@
 # Required-Stop: $local_fs $remote_fs $network
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
-# Short-Description: Shibboleth 2 Service Provider Daemon
+# Short-Description: Shibboleth 3 Service Provider Daemon
 # Description: Starts the separate daemon used by the Shibboleth
 # Apache module to manage sessions and to retrieve
 # attributes from Shibboleth Identity Providers.
@@ -20,7 +20,7 @@
 # by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Shibboleth 2 daemon"
+DESC="Shibboleth 3 daemon"
 NAME=shibd
 SHIB_HOME=@-PREFIX-@
 SHIBSP_CONFIG=@-PKGSYSCONFDIR-@/shibboleth2.xml
diff --git a/configs/shibd-osx.plist.in b/configs/shibd-osx.plist.in
index 6602265..07ebca3 100644
--- a/configs/shibd-osx.plist.in
+++ b/configs/shibd-osx.plist.in
@@ -2,8 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Label</key> <string>edu.internet2.shibboleth.shibd</string>
-	<key>ServiceDescription</key> <string>Shibboleth 2 Service Provider daemon</string>
+	<key>Label</key> <string>net.shibboleth.sp.shibd</string>
+	<key>ServiceDescription</key> <string>Shibboleth 3 Service Provider daemon</string>
 
 	<key>ProgramArguments</key>
 	<array>
diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index 6ac078b..adeeb0c 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -3,7 +3,7 @@
 # shibd Shibboleth Service Provider Daemon
 #
 # chkconfig: - 80 20
-# description: Shibboleth 2 Service Provider Daemon
+# description: Shibboleth 3 Service Provider Daemon
 # processname: shibd
 # pidfile: @-PKGRUNDIR-@/shibd.pid
 # config: @-PKGSYSCONFDIR-@/shibboleth2.xml
@@ -16,7 +16,7 @@
 # Required-Stop: $local_fs $remote_fs $network
 # Default-Start: 3 5
 # Default-Stop: 0 1 2 6 
-# Short-Description: Shibboleth 2 Service Provider Daemon
+# Short-Description: Shibboleth 3 Service Provider Daemon
 # Description: Starts the separate daemon used by the Shibboleth Apache module to manage state and SAML interactions.
 ### END INIT INFO
 
@@ -24,7 +24,7 @@
 . /etc/rc.d/init.d/functions
 
 shibd="@-PREFIX-@/sbin/shibd"
-SHIBD_USER=root
+SHIBD_USER=shibd
 SHIBD_UMASK=022
 SHIBD_WAIT=30
 prog=shibd
diff --git a/configs/shibd-suse.in b/configs/shibd-suse.in
index d0bc01b..55f9186 100644
--- a/configs/shibd-suse.in
+++ b/configs/shibd-suse.in
@@ -13,18 +13,18 @@
 # Required-Stop: $local_fs $remote_fs $network
 # Default-Start: 3 5
 # Default-Stop: 0 1 2 6 
-# Short-Description: Shibboleth 2.x Service Provider Daemon
+# Short-Description: Shibboleth 3 Service Provider Daemon
 # Description: Starts the separate daemon used by the Shibboleth Apache module to manage state and SAML interactions.
 ### END INIT INFO
 #
  
-DESC="Shibboleth 2 daemon"
+DESC="Shibboleth 3 daemon"
 NAME=shibd
 SHIB_CONFIG=@-PKGSYSCONFDIR-@/shibboleth2.xml
 DAEMON=@-PREFIX-@/sbin/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
 PID_FILE=@-PKGRUNDIR-@/shibd.pid
-SHIBD_USER=root
+SHIBD_USER=shibd
 SHIBD_UMASK=022
 SHIBD_WAIT=30
 DAEMON_OPTS=""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.