summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-07-21 11:58:16 -0500
committerInstrumental <jonathan.gathman@att.com>2018-07-21 11:58:23 -0500
commit65c40b3bffb78a1a77d82fc74bbf633a6d0d906f (patch)
tree932109726bec5b207734df429b880cb50ccb22a0
parentc23f2cdcda93f260e26781dfa59dfe2b89c77402 (diff)
Fix errors found no Container mode
Issue-ID: AAF-318 Change-Id: I90cca45dc91e191594707fdabb54a552d4d90127 Signed-off-by: Instrumental <jonathan.gathman@att.com>
-rw-r--r--auth/auth-locate/pom.xml8
-rw-r--r--auth/sample/etc/org.osaaf.aaf.locate.props2
-rw-r--r--conf/CA/truststore.sh5
3 files changed, 13 insertions, 2 deletions
diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 76fe2a19..c7a13464 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -61,6 +61,14 @@
<artifactId>aaf-auth-cass</artifactId>
</dependency>
+ <!-- Add the Organizations you wish to support. You can delete ONAP if
+ you have something else Match with Property Entry: Organization.<root ns>,
+ i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
+ <dependency>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-auth-deforg</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
diff --git a/auth/sample/etc/org.osaaf.aaf.locate.props b/auth/sample/etc/org.osaaf.aaf.locate.props
index 90c2c57f..25d6217b 100644
--- a/auth/sample/etc/org.osaaf.aaf.locate.props
+++ b/auth/sample/etc/org.osaaf.aaf.locate.props
@@ -2,7 +2,7 @@
## org.osaaf.aaf.locate
## AAF Locator Properties
##
-cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opts/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
+cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
aaf_component=AAF_NS.locator:2.1.2
port=8095
diff --git a/conf/CA/truststore.sh b/conf/CA/truststore.sh
index 399048cb..0414c486 100644
--- a/conf/CA/truststore.sh
+++ b/conf/CA/truststore.sh
@@ -1,2 +1,5 @@
+
echo "FYI, by convention, truststore passwords are 'changeit', but you may add something more sophisticated"
-openssl pkcs12 -export -name AAF_Root_CA -in certs/ca.crt -nokeys -out truststore.p12
+# PCKS12 does not appear to be able to mark CAs as Trusted
+# openssl pkcs12 -export -name AAF_Root_CA -in certs/ca.crt -nokeys -out truststore.p12
+keytool -importcert -file certs/ca.crt -trustcacerts -alias AAF_ROOT_CA -keystore truststore.jks