Merge pull request #31 from matyasselmeci/wip/fixups

Small fixups

Author: matyasselmeci

Makefile

@@ -90,6 +90,7 @@ install:
 	# XRootD configuration files
 	install -p -m 0644 $(XROOTD_CONFIG) $(DESTDIR)/$(INSTALL_XROOTD_DIR)
 	ln -srf $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-cache.cfg $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-cache-auth.cfg
+	ln -srf $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-origin.cfg $(DESTDIR)/$(INSTALL_XROOTD_DIR)/xrootd-stash-origin-auth.cfg
 	mkdir -p $(DESTDIR)/$(INSTALL_XROOTD_DIR)/config.d
 	install -p -m 0644 $(XROOTD_CONFIGD) $(DESTDIR)/$(INSTALL_XROOTD_DIR)/config.d
 	# systemd unit files

configs/xrootd-stash-origin.cfg

@@ -21,13 +21,18 @@
 # By default, we set this to the OSG Data Federation
 all.manager redirector.osgstorage.org+ 1213
 #
-# Alternately, use the following line for a test sesrver
+# Alternately, use the following line for a test server
 #
 # all.manager redirector-itb.osgstorage.org+ 1213
 
 
 # A few reasonable defaults for the origin server.
-xrd.port 1094
+if named stash-origin-auth
+    xrd.port 1095
+else
+    xrd.port 1094
+fi
+
 all.role server
 
 

rpm/xcache.spec

@@ -1,7 +1,7 @@
 Name:      xcache
 Summary:   XCache scripts and configurations
 Version:   1.0.0
-Release:   0.rc1%{?dist}
+Release:   0.rc2%{?dist}
 License:   Apache 2.0
 Group:     Grid
 URL:       https://opensciencegrid.org/docs/
@@ -104,6 +104,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
 
 %files -n stash-origin
 %config %{_sysconfdir}/xrootd/xrootd-stash-origin.cfg
+%config %{_sysconfdir}/xrootd/xrootd-stash-origin-auth.cfg
 %config %{_sysconfdir}/xrootd/config.d/50-stash-origin-authz.cfg
 %config %{_sysconfdir}/xrootd/config.d/50-stash-origin-paths.cfg
 %config(noreplace) %{_sysconfdir}/xrootd/config.d/10-origin-site-local.cfg