summaryrefslogtreecommitdiffstats
path: root/auth/sample
diff options
context:
space:
mode:
Diffstat (limited to 'auth/sample')
-rw-r--r--auth/sample/bin/service.sh3
-rw-r--r--auth/sample/etc/org.osaaf.aaf.cm.props2
-rw-r--r--auth/sample/etc/org.osaaf.aaf.fs.props2
-rw-r--r--auth/sample/etc/org.osaaf.aaf.gui.props2
-rw-r--r--auth/sample/etc/org.osaaf.aaf.hello.props2
-rw-r--r--auth/sample/etc/org.osaaf.aaf.locate.props2
-rw-r--r--auth/sample/etc/org.osaaf.aaf.oauth.props2
-rw-r--r--auth/sample/etc/org.osaaf.aaf.service.props2
-rw-r--r--auth/sample/local/aaf.props6
-rw-r--r--auth/sample/local/initialConfig.props34
-rw-r--r--auth/sample/logs/taillog2
11 files changed, 39 insertions, 20 deletions
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 20be29c4..75d658d1 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -36,6 +36,9 @@ JAVA_AAFCLI="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar -Dcadi_prop_files=$LO
# If doesn't exist... still create
mkdir -p $OSAAF
+# If not created by separate PV, create
+mkdir -p /opt/app/aaf/status
+
# Temp use for clarity of code
FILE=
diff --git a/auth/sample/etc/org.osaaf.aaf.cm.props b/auth/sample/etc/org.osaaf.aaf.cm.props
index dc43c282..9781ea42 100644
--- a/auth/sample/etc/org.osaaf.aaf.cm.props
+++ b/auth/sample/etc/org.osaaf.aaf.cm.props
@@ -23,7 +23,7 @@
## Note: Link to CA Properties in "local" dir
##
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cm.ca.props
-aaf_locator_names=cm
+aaf_locator_entries=cm
port=8100
aaf_locator_public_port.helm=30084
# aaf_locator_public_port.oom=
diff --git a/auth/sample/etc/org.osaaf.aaf.fs.props b/auth/sample/etc/org.osaaf.aaf.fs.props
index 9de81af6..02dc0ac9 100644
--- a/auth/sample/etc/org.osaaf.aaf.fs.props
+++ b/auth/sample/etc/org.osaaf.aaf.fs.props
@@ -22,7 +22,7 @@
## AAF Fileserver Properties
##
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props
-aaf_locator_names=fs
+aaf_locator_entries=fs
port=8096
aaf_locator_port.helm=30085
# aaf_locator_port.oom=
diff --git a/auth/sample/etc/org.osaaf.aaf.gui.props b/auth/sample/etc/org.osaaf.aaf.gui.props
index 81d04ea0..b6e9072b 100644
--- a/auth/sample/etc/org.osaaf.aaf.gui.props
+++ b/auth/sample/etc/org.osaaf.aaf.gui.props
@@ -22,7 +22,7 @@
## AAF GUI Properties
##
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
-aaf_locator_names=gui
+aaf_locator_entries=gui
port=8200
aaf_locator_port.helm=30083
#aaf_locator_port.oom=
diff --git a/auth/sample/etc/org.osaaf.aaf.hello.props b/auth/sample/etc/org.osaaf.aaf.hello.props
index 5add3014..ea31b3a6 100644
--- a/auth/sample/etc/org.osaaf.aaf.hello.props
+++ b/auth/sample/etc/org.osaaf.aaf.hello.props
@@ -22,7 +22,7 @@
## AAF Hello Properties
##
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props
-aaf_locator_names=hello
+aaf_locator_entries=hello
port=8130
aaf_locator_public_port.helm=30086
#aaf_locator_public_port.oom=
diff --git a/auth/sample/etc/org.osaaf.aaf.locate.props b/auth/sample/etc/org.osaaf.aaf.locate.props
index 1b74f654..09798334 100644
--- a/auth/sample/etc/org.osaaf.aaf.locate.props
+++ b/auth/sample/etc/org.osaaf.aaf.locate.props
@@ -22,7 +22,7 @@
## AAF Locator Properties
##
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_locator_names=locator
+aaf_locator_entries=locator
port=8095
aaf_locator_public_port.helm=30081
#aaf_locator_public_port.oom=
diff --git a/auth/sample/etc/org.osaaf.aaf.oauth.props b/auth/sample/etc/org.osaaf.aaf.oauth.props
index a968b949..d9b17064 100644
--- a/auth/sample/etc/org.osaaf.aaf.oauth.props
+++ b/auth/sample/etc/org.osaaf.aaf.oauth.props
@@ -21,7 +21,7 @@
## AAF OAuth2 Properties
##
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
-aaf_locator_names=oauth,token,introspect
+aaf_locator_entries=oauth,token,introspect
port=8140
aaf_locator_public_port.helm=30082
#aaf_locator_public_port.oom=
diff --git a/auth/sample/etc/org.osaaf.aaf.service.props b/auth/sample/etc/org.osaaf.aaf.service.props
index 5c9714c4..87924ba8 100644
--- a/auth/sample/etc/org.osaaf.aaf.service.props
+++ b/auth/sample/etc/org.osaaf.aaf.service.props
@@ -22,7 +22,7 @@
## AAF Service Properties
##
cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props
-aaf_locator_names=service
+aaf_locator_entries=service
port=8100
aaf_locator_public_port.helm=30080
#aaf_locator_public_port.oom=
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index bae24d42..4eb70a9b 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -35,12 +35,6 @@ cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks
cadi_truststore_password=changeit
cadi_x509_issuers=
-# Locator info
-aaf_locator_ns=AAF_NS
-aaf_locator_fqdn.docker=aaf-%N
-aaf_locator_fqdn.oom=%CNS.aaf-%N
-aaf_locator_fqdn.helm=%CNS.aaf-%N
-
# Other
aaf_data_dir=/opt/app/osaaf/data
cadi_token_dir=/opt/app/osaaf/tokens
diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props
index 9c7e3df0..91d5338f 100644
--- a/auth/sample/local/initialConfig.props
+++ b/auth/sample/local/initialConfig.props
@@ -19,10 +19,32 @@
#
cadi_protocols=TLSv1.1,TLSv1.2
+################################
+# Locator info
+#
+# Sample versions for
+# 1) no container
+# 2) Docker
+# 3) Helm (Kubernetes and Helm)
+# 4) OOM (Kubernetes with OOM)
+################################
+aaf_locator_ns=AAF_NS
+aaf_locator_name=%NS.%N
+aaf_locator_name.docker=%CNS.%NS.%N
+aaf_locator_name.helm=%CNS.%NS.%N
+aaf_locator_name.oom=%CNS.%NS.%N
+aaf_locator_fqdn.docker=aaf-%N
+aaf_locator_fqdn.helm=aaf-%N.%CNS
+aaf_locator_fqdn.oom=aaf-%N.%CNS
+
+################################
+# AAF URLs
+################################
aaf_locate_url=https://localhost:8095
-aaf_url=https://AAF_LOCATE_URL/%C%AAF_NS.service:2.1
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C%AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C%AAF_NS.token:2.1/token
-cm_url=https://AAF_LOCATE_URL/%C%AAF_NS.cm:2.1
-gui_url=https://AAF_LOCATE_URL/%C%AAF_NS.gui.2.1
-fs_url=https://AAF_LOCATE_URL/%C%AAF_NS.fs.2.1
+aaf_url=https://AAF_LOCATE_URL/%C.%AAF_NS.service:2.1
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/%C.%AAF_NS.oauth:2.1/token
+cm_url=https://AAF_LOCATE_URL/%C.%AAF_NS.cm:2.1
+gui_url=https://AAF_LOCATE_URL/%C.%AAF_NS.gui.2.1
+fs_url=https://AAF_LOCATE_URL/%C.%AAF_NS.fs.2.1
+
diff --git a/auth/sample/logs/taillog b/auth/sample/logs/taillog
index 5689caa4..77eb4581 100644
--- a/auth/sample/logs/taillog
+++ b/auth/sample/logs/taillog
@@ -1,3 +1,3 @@
#!/bin/bash
cd /opt/app/osaaf/logs
-tail -f `find ./$1 -name *service*.log -ctime 0`
+tail -f `find ./$1 -name *service*.log -mtime 0`