summaryrefslogtreecommitdiffstats
path: root/packages/policy-distribution-tarball
diff options
context:
space:
mode:
authorliboNet <libo.zhu@intel.com>2018-12-20 06:57:56 +0800
committerliboNet <libo.zhu@intel.com>2018-12-20 06:57:56 +0800
commit5654548387d1ba2c3776d1a01276103481ac41cd (patch)
tree61bdbb8b5246ee2e4b93e105e6e9a1a2d2478e88 /packages/policy-distribution-tarball
parentfc32c230809a051bc1c17e8a2a447210822eebe7 (diff)
Fix lineEnding issue for policy-keystore
. separate the etc/ssl from etc in assembly . fix the JVM property typo by using trustStorePassword Change-Id: I0e00bf211de96939346c46e0486361e29f9e20f7 Issue-ID: POLICY-1385 Signed-off-by: liboNet <libo.zhu@intel.com>
Diffstat (limited to 'packages/policy-distribution-tarball')
-rw-r--r--packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml b/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml
index ad976c7e..351fe7e3 100644
--- a/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml
@@ -48,7 +48,8 @@
<directory>${project.basedir}/src/main/resources/etc
</directory>
<includes>
- <include>**/*</include>
+ <include>*.json</include>
+ <include>*.xml</include>
</includes>
<outputDirectory>/etc</outputDirectory>
<lineEnding>unix</lineEnding>
@@ -56,5 +57,14 @@
<exclude>*.formatted</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/main/resources/etc/ssl
+ </directory>
+ <includes>
+ <include>policy*</include>
+ </includes>
+ <outputDirectory>/etc/ssl</outputDirectory>
+ <lineEnding>keep</lineEnding>
+ </fileSet>
</fileSets>
</assembly>