Skip to content

Commit

Permalink
systemtest: fix install command in credentials command
Browse files Browse the repository at this point in the history
The system-test includes a utility script for managing credentials
and trust-stores.  The install command should ensure that clients
trust the disposable CA used to generate dCache certificate.

Unfortunately, it fails to copy the necessary files, which this
patch fixes.

Target: master
Patch: https://rb.dcache.org/r/8348/
Acked-by: Gerd Behrmann
Requires-notes: no
Requires-book: no
Request: 2.13
Request: 2.12
Request: 2.11
Request: 2.10

Conflicts:
	packages/system-test/pom.xml

Conflicts:
	packages/system-test/pom.xml
  • Loading branch information
paulmillar committed Jun 23, 2015
1 parent 9448a43 commit 94e4959
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions packages/system-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<filtersfile file="${project.basedir}/src/main/assembly/filter.properties" />
<filter token="project.version" value="${project.version}" />
<filter token="TARGET" value="${project.build.directory}" />
<filter token="SOURCE" value="${project.basedir}/src/main"/>
<filter token="DCACHE_LOAD_CONFIG" value=" DCACHE_HOME=&quot;${project.build.directory}/${project.build.finalName}&quot;${line.separator} DCACHE_CLASSPATH=&quot;${DCACHE_HOME}/share/classes/*&quot;${line.separator} DCACHE_DEFAULTS=&quot;${DCACHE_HOME}/share/defaults&quot;${line.separator} DCACHE_CACHED_CONFIG=&quot;${DCACHE_HOME}/var/config/cache&quot;${line.separator} . &quot;${DCACHE_HOME}/share/lib/loadConfig.sh&quot;" />
</filterset>

Expand Down
4 changes: 4 additions & 0 deletions packages/system-test/src/main/bin/credentials
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,10 @@ EOF
echo
fi
fi
else
for file in @SOURCE@/skel/etc/grid-security/certificates/*; do
files_to_trust="$files_to_trust $(basename $file)"
done
fi


Expand Down

0 comments on commit 94e4959

Please sign in to comment.