Skip to content

Commit 93d0ba6

Browse files
committed
webdav: switch hard-coded JGlobus paths to those configured
The WebDAV door may use either Jetty's built-in SSL support or support coming from JGlobus. If the latter is chosen then various paths are hard-coded. This does not respect a site's configuration and, as a specific example, results in the system-test failing. This patch switches the JGlobus WebDAV SSL connector to use the configured path. Patch: http://rb.dcache.org/r/5575/ Acked-by: Gerd Behrmann Target: master Request: 2.6
1 parent 06b5071 commit 93d0ba6

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

modules/dcache-webdav/src/main/resources/org/dcache/webdav/webdav.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,9 @@
271271

272272
<property name="port" value="${webdavPort}"/>
273273
<property name="host" value="${webdavAddress}"/>
274-
<property name="hostCertificatePath"
275-
value="/etc/grid-security/hostcert.pem"/>
276-
<property name="hostKeyPath"
277-
value="/etc/grid-security/hostkey.pem"/>
278-
<property name="caCertificatePath"
279-
value="/etc/grid-security/certificates"/>
274+
<property name="hostCertificatePath" value="${grid.hostcert.cert}"/>
275+
<property name="hostKeyPath" value="${grid.hostcert.key}"/>
276+
<property name="caCertificatePath" value="${grid.ca.path}"/>
280277
<property name="autoFlush" value="true"/>
281278
<property name="encrypt" value="true"/>
282279
<property name="requireClientAuth" value="${webdavWantClientAuth}"/>

skel/share/services/webdav.batch

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ enddefine
6868
define env verify-https-jglobus.exe enddefine
6969
check -strong trustAnchorRefreshPeriod
7070
check -strong hostCertificateRefreshPeriod
71+
check -strong grid.hostcert.cert
72+
check -strong grid.hostcert.key
73+
check -strong grid.ca.path
7174
enddefine
7275

7376
define env failMissingKeyStore.exe enddefine
@@ -147,4 +150,7 @@ create org.dcache.cells.UniversalSpringCell ${cell.name} \
147150
-webdav.overwrite=${webdav.overwrite} \
148151
-missing-files.timeout=${missing-files.timeout} \
149152
-missing-files.name=${missing-files.name} \
153+
-grid.hostcert.cert=${grid.hostcert.cert} \
154+
-grid.hostcert.key=${grid.hostcert.key} \
155+
-grid.ca.path=${grid.ca.path} \
150156
-export -cellClass=WebDAVDoor"

0 commit comments

Comments
 (0)