Move some file locations around.

Move the shar socket from /tmp/shar-socket to /var/run/shib-shar.sock
Move the shire.log from /var/log/shibboleth to /var/log/httpd

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 5b4d216..0a22e9f 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,8 +2,10 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglogdir=${localstatedir}/log/@PACKAGE@
+pkglogdir = ${localstatedir}/log/@PACKAGE@
+shirelogdir = ${localstatedir}/log/httpd
 pkgxmldir = $(datadir)/xml/@PACKAGE@
+varrundir = $(localstatedir)/run
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
        apache.config \
@@ -42,7 +44,9 @@ do-build-file:
            -e 's:@-LIBEXECDIR-@:${libexecdir}:' \
            -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
            -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \
-           -e 's:@-PKGLOGDIR-@:${pkglogdir}:'
+           -e 's:@-PKGLOGDIR-@:${pkglogdir}:' \
+           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:' \
+           -e 's:@-VARRUNDIR-@:${varrundir}:'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 

diff --git a/configs/shibboleth.xml.in b/configs/shibboleth.xml.in
index 14defcd..6853f13 100644 (file)
--- a/configs/shibboleth.xml.in
+++ b/configs/shibboleth.xml.in
@@ -16,7 +16,7 @@
         -->
     
        <!-- Only one listener can be defined. -->
-        <UnixListener address="/tmp/shar-socket"/>
+        <UnixListener address="@-VARRUNDIR-@/shib-shar.sock"/>
 
         <!-- <TCPListener address="127.0.0.1" port="12345" acl="127.0.0.1"/> -->
         

diff --git a/configs/shire.logger.in b/configs/shire.logger.in
index 8f6af92..3643db0 100644 (file)
--- a/configs/shire.logger.in
+++ b/configs/shire.logger.in
@@ -11,7 +11,7 @@ log4j.category.Shibboleth-TRANSACTION=WARN
 # define the appenders
 
 log4j.appender.shire_log=org.apache.log4j.RollingFileAppender
-log4j.appender.shire_log.fileName=@-PKGLOGDIR-@/shire.log
+log4j.appender.shire_log.fileName=@-SHIRELOGDIR-@/shire.log
 log4j.appender.shire_log.maxFileSize=1000000e
 log4j.appender.shire_log.maxBackupIndex=10
 #log4j.appender.shire_log.layout=org.apache.log4j.BasicLayout