diff options
| author |   liboNet <libo.zhu@intel.com> | 2018-12-20 06:57:56 +0800 |
|---|---|---|
| committer |   Pamela Dragosh <pdragosh@research.att.com> | 2019-01-10 09:50:50 +0000 |
| commit | 4108a0b918749ee6d13e8476552ee471c92a0a6d (patch) | |
| tree | c827f47b4b1c207c415d86e4a33c7dec3c975017 | |
| parent | 2511b36968b84151c67d7227c043bf90855ce161 (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>
(cherry picked from commit 5654548387d1ba2c3776d1a01276103481ac41cd)
| -rw-r--r-- | packages/policy-distribution-docker/src/main/docker/policy-dist.sh | 2 | ||||
| -rw-r--r-- | packages/policy-distribution-tarball/src/main/package/tarball/assembly.xml | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh index 91d7290d..5ea7d83c 100644 --- a/packages/policy-distribution-docker/src/main/docker/policy-dist.sh +++ b/packages/policy-distribution-docker/src/main/docker/policy-dist.sh @@ -40,4 +40,4 @@ fi echo "Policy distribution config file: $CONFIG_FILE" -$JAVA_HOME/bin/java -cp "$POLICY_DISTRIBUTION_HOME/etc:$POLICY_DISTRIBUTION_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStore="$TRUSTSTORE_PASSWD" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE +$JAVA_HOME/bin/java -cp "$POLICY_DISTRIBUTION_HOME/etc:$POLICY_DISTRIBUTION_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.distribution.main.startstop.Main -c $CONFIG_FILE 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> |