From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 25 Sep 2007 17:33:50 +0000 (+0000)
Subject: Change socket name.
X-Git-Tag: 2.0-beta2~106
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=41aac4a95bec17c06b0eb44b2a16a71af37ab17a

Change socket name.
Move socket to /var/run/shibboleth.
---

diff --git a/configs/Makefile.am b/configs/Makefile.am
index cbb949f..4d798b4 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -7,7 +7,7 @@ pkgdocdir = ${datadir}/doc/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
 xmldir = $(datadir)/xml
 pkgxmldir = $(datadir)/xml/@PACKAGE@
-varrundir = $(localstatedir)/run
+pkgrundir = $(localstatedir)/run/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
 	shibd-redhat \
@@ -58,7 +58,7 @@ do-build-file:
         -e 's:@-XMLDIR-@:${xmldir}:g' \
         -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
         -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-        -e 's:@-VARRUNDIR-@:${varrundir}:g'
+        -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
 	cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
 	rm -f ${FILE}.tmp
 
@@ -104,7 +104,7 @@ install-data-local:	all-data-local
 	$(mkinstalldirs) $(DESTDIR)$(pkglogdir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
 	$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
-	$(mkinstalldirs) $(DESTDIR)$(varrundir)
+	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
 	for f in $(BUILTCONFIGFILES); do \
diff --git a/configs/shibboleth2.xml.in b/configs/shibboleth2.xml.in
index 6842035..7cc75e4 100644
--- a/configs/shibboleth2.xml.in
+++ b/configs/shibboleth2.xml.in
@@ -18,11 +18,10 @@
 		-->
     
 		<!-- Only one listener can be defined. -->
-		   <UnixListener address="@-VARRUNDIR-@/shib-shar.sock"/>
+		<UnixListener address="@-PKGRUNDIR-@/shibd.sock"/>
 		
 		<!-- <TCPListener address="127.0.0.1" port="12345" acl="127.0.0.1"/> -->
 		
-
 		<StorageService type="Memory" id="memory" cleanupInterval="900"/>
 		<SessionCache type="StorageService" StorageService="memory" cacheTimeout="3600"/>
 		<ReplayCache StorageService="memory"/>
diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index 903da88..a49f301 100644
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -27,7 +27,7 @@ SHIBSP_CONFIG=@-PKGSYSCONFDIR-@/shibboleth2.xml
 LD_LIBRARY_PATH=@-PREFIX-@/lib
 DAEMON=@-PREFIX-@/sbin/$NAME
 SCRIPTNAME=/etc/init.d/$NAME
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=@-PKGRUNDIR-@/$NAME.pid
 DAEMON_OPTS=""
 
 # Force removal of socket
diff --git a/configs/shibd-osx.plist.in b/configs/shibd-osx.plist.in
index db6be73..268121f 100644
--- a/configs/shibd-osx.plist.in
+++ b/configs/shibd-osx.plist.in
@@ -10,7 +10,7 @@
 		<string>@-PREFIX-@/sbin/shibd</string>
 		<string>-f</string>
 		<string>-p</string>
-		<string> @-VARRUNDIR-@/shibd.pid</string>
+		<string> @-PKGRUNDIR-@/shibd.pid</string>
 	</array>
 
 	<key>RunAtLoad</key> <false/>
diff --git a/configs/shibd-redhat.in b/configs/shibd-redhat.in
index 68553b0..496f631 100644
--- a/configs/shibd-redhat.in
+++ b/configs/shibd-redhat.in
@@ -5,14 +5,14 @@
 # chkconfig: - 98 02
 # description: Shibboleth 2 Service Provider Daemon
 # processname: shibd
-# pidfile: @-VARRUNDIR-@/shibd.pid
+# pidfile: @-PKGRUNDIR-@/shibd.pid
 # config: @-PKGSYSCONFDIR-@/shibboleth2.xml
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 shibd="@-PREFIX-@/sbin/shibd"
 SHIBD_USER=root
-pidfile=@-VARRUNDIR-@/shibd.pid
+pidfile=@-PKGRUNDIR-@/shibd.pid
 prog=shibd
 RETVAL=0
 
diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs
index 3c07957..b8b268a 100644
--- a/msi/scripts/shib_edit_config_files.vbs
+++ b/msi/scripts/shib_edit_config_files.vbs
@@ -96,7 +96,7 @@ if (Err = 0) then
   ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec"
   ReplaceInFile ConfigFile, "@-LOGDIR-@", ConvertedDir & "/var/log/shibboleth"
   ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir
-  ReplaceInFile ConfigFile, "   <UnixListener address=""@-VARRUNDIR-@/shib-shar.sock""/>", "<!-- <UnixListener address=""@-VARRUNDIR-@/shib-shar.sock""/> -->"
+  ReplaceInFile ConfigFile, "   <UnixListener address=""@-PKGRUNDIR-@/shibd.sock""/>", "<!-- <UnixListener address=""@-PKGRUNDIR-@/shibd.sock""/> -->"
   ReplaceInFile ConfigFile, "<!-- <TCPListener address=""127.0.0.1"" port=""12345"" acl=""127.0.0.1""/> -->", "<TCPListener address=""127.0.0.1"" port=""" & ShibdPort & """ acl=""127.0.0.1""/>"
   If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then
     FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibboleth2.xml", false