From 9ec2895301056a9e8967eadb139e56f03776fe26 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 12 Jul 2018 11:14:10 -0500 Subject: Configuration Agent and MS for AAF Issue-ID: AAF-361 Change-Id: I26f3d49e3d7eae4a932489bd677cf0b903fb7977 Signed-off-by: Instrumental --- auth/sample/bin/agent.sh | 85 ++++++++++++++++++++++++ auth/sample/etc/org.osaaf.aaf.cm.props | 14 ++++ auth/sample/etc/org.osaaf.aaf.fs.props | 9 +++ auth/sample/etc/org.osaaf.aaf.gui.props | 30 +++++++++ auth/sample/etc/org.osaaf.aaf.hello.props | 8 +++ auth/sample/etc/org.osaaf.aaf.locate.props | 8 +++ auth/sample/etc/org.osaaf.aaf.log4j.props | 51 ++++++++++++++ auth/sample/etc/org.osaaf.aaf.oauth.props | 8 +++ auth/sample/etc/org.osaaf.aaf.orgs.props | 11 +++ auth/sample/etc/org.osaaf.aaf.service.props | 8 +++ auth/sample/etc/org.osaaf.cm.props | 14 ---- auth/sample/etc/org.osaaf.common.props | 30 --------- auth/sample/etc/org.osaaf.fs.props | 10 --- auth/sample/etc/org.osaaf.gui.props | 30 --------- auth/sample/etc/org.osaaf.hello.props | 8 --- auth/sample/etc/org.osaaf.locate.props | 8 --- auth/sample/etc/org.osaaf.log4j.props | 51 -------------- auth/sample/etc/org.osaaf.oauth.props | 8 --- auth/sample/etc/org.osaaf.orgs.props | 11 --- auth/sample/etc/org.osaaf.service.props | 8 --- auth/sample/local/.gitignore | 2 + auth/sample/local/aaf.props | 18 +++++ auth/sample/local/initialConfig.props | 10 +++ auth/sample/local/org.osaaf.aaf.cassandra.props | 30 +++++++++ auth/sample/local/org.osaaf.aaf.cm.ca.props | 11 +++ auth/sample/local/org.osaaf.aaf.cm.p12 | Bin 2818 -> 0 bytes auth/sample/local/org.osaaf.aaf.keyfile | 27 -------- auth/sample/local/org.osaaf.aaf.p12 | Bin 4180 -> 0 bytes auth/sample/local/org.osaaf.aaf.props | 17 ----- auth/sample/local/org.osaaf.aaf.trust.p12 | Bin 1560 -> 0 bytes auth/sample/local/org.osaaf.cassandra.props | 29 -------- auth/sample/local/org.osaaf.cm.ca.props | 11 --- auth/sample/local/org.osaaf.location.props | 12 ---- auth/sample/logs/clean | 6 ++ auth/sample/logs/taillog | 1 + 35 files changed, 310 insertions(+), 274 deletions(-) create mode 100644 auth/sample/bin/agent.sh create mode 100644 auth/sample/etc/org.osaaf.aaf.cm.props create mode 100644 auth/sample/etc/org.osaaf.aaf.fs.props create mode 100644 auth/sample/etc/org.osaaf.aaf.gui.props create mode 100644 auth/sample/etc/org.osaaf.aaf.hello.props create mode 100644 auth/sample/etc/org.osaaf.aaf.locate.props create mode 100644 auth/sample/etc/org.osaaf.aaf.log4j.props create mode 100644 auth/sample/etc/org.osaaf.aaf.oauth.props create mode 100644 auth/sample/etc/org.osaaf.aaf.orgs.props create mode 100644 auth/sample/etc/org.osaaf.aaf.service.props delete mode 100644 auth/sample/etc/org.osaaf.cm.props delete mode 100644 auth/sample/etc/org.osaaf.common.props delete mode 100644 auth/sample/etc/org.osaaf.fs.props delete mode 100644 auth/sample/etc/org.osaaf.gui.props delete mode 100644 auth/sample/etc/org.osaaf.hello.props delete mode 100644 auth/sample/etc/org.osaaf.locate.props delete mode 100644 auth/sample/etc/org.osaaf.log4j.props delete mode 100644 auth/sample/etc/org.osaaf.oauth.props delete mode 100644 auth/sample/etc/org.osaaf.orgs.props delete mode 100644 auth/sample/etc/org.osaaf.service.props create mode 100644 auth/sample/local/.gitignore create mode 100644 auth/sample/local/aaf.props create mode 100644 auth/sample/local/initialConfig.props create mode 100644 auth/sample/local/org.osaaf.aaf.cassandra.props create mode 100644 auth/sample/local/org.osaaf.aaf.cm.ca.props delete mode 100644 auth/sample/local/org.osaaf.aaf.cm.p12 delete mode 100644 auth/sample/local/org.osaaf.aaf.keyfile delete mode 100644 auth/sample/local/org.osaaf.aaf.p12 delete mode 100644 auth/sample/local/org.osaaf.aaf.props delete mode 100644 auth/sample/local/org.osaaf.aaf.trust.p12 delete mode 100644 auth/sample/local/org.osaaf.cassandra.props delete mode 100644 auth/sample/local/org.osaaf.cm.ca.props delete mode 100644 auth/sample/local/org.osaaf.location.props create mode 100644 auth/sample/logs/clean create mode 100644 auth/sample/logs/taillog (limited to 'auth/sample') diff --git a/auth/sample/bin/agent.sh b/auth/sample/bin/agent.sh new file mode 100644 index 00000000..b4ea272e --- /dev/null +++ b/auth/sample/bin/agent.sh @@ -0,0 +1,85 @@ +# This script is run when starting aaf_config Container. +# It needs to cover the cases where the initial data doesn't exist, and when it has already been configured (don't overwrite) +# +JAVA=/usr/bin/java + +# Only load Identities once +if [ ! -e /opt/app/osaaf/data/identities.dat ]; then + mkdir -p /opt/app/osaaf/data + cp /opt/app/aaf_config/data/sample.identities.dat /opt/app/osaaf/data/identities.dat +fi + +# Only initialize once, automatically... +if [ ! -e /opt/app/osaaf/local/org.osaaf.aaf.props ]; then + for D in local; do + rsync -avzh /opt/app/aaf_config/$D/org.osaaf.aaf* /opt/app/osaaf/$D + done + for D in public etc logs; do + rsync -avzh --exclude=.gitignore /opt/app/aaf_config/$D/* /opt/app/osaaf/$D + done + $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar config osaaf@aaf.osaaf.org \ + cadi_etc_dir=/opt/app/osaaf/local \ + cadi_prop_files=/opt/app/aaf_config/local/initialConfig.props:/opt/app/aaf_config/local/aaf.props \ + cadi_latitude=38.4329 \ + cadi_longitude=-90.43248 + #cp /opt/app/aaf_config/ +else + CMD=$2 + shift + if [ "$CMD" = "" ]; then + echo "AAF already configured for this Volume" + else + case "$CMD" in + ls) + echo ls requested + find /opt/app/osaaf -depth + ;; + cat) + if [ "$1" = "" ]; then + echo "usage: cat " + else + if [[ $1 == *.props ]]; then + echo + echo "## CONTENTS OF $3" + echo + cat $1 + else + echo "### ERROR ####" + echo " \"cat\" may only be used with files ending with \".props\"" + fi + fi + ;; + update) + for D in public data etc local logs; do + rsync -uh --exclude=.gitignore /opt/app/aaf_config/$D /opt/app/osaaf + done + ;; + validate) + echo "## validate requested" + $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar validate cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props + ;; + bash) + if [ ! "grep aaf_config ~/.bashrc" == "" ]; then + echo "alias cadi='/bin/bash /opt/app/aaf_config/bin/agent.sh $*'" >> ~/.bashrc + . ~/.bashrc + fi + shift + /bin/bash $* + ;; + encrypt) + echo $1 $2 $3 + cd /opt/app/osaaf/local + + for F in `grep -l $2 *.props`; do + echo "Changing $F" + PWD=`$JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar cadi digest $3 /opt/app/osaaf/local/org.osaaf.aaf.keyfile` + sed -i.old -e "s/\($2=\).*/\1enc=$PWD/" /opt/app/osaaf/local/org.osaaf.aaf.cred.props + cat $F + done + ;; + *) + $JAVA -Dcadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar $* + esac + fi +fi + diff --git a/auth/sample/etc/org.osaaf.aaf.cm.props b/auth/sample/etc/org.osaaf.aaf.cm.props new file mode 100644 index 00000000..1fa13fe3 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.cm.props @@ -0,0 +1,14 @@ +## +## org.osaaf.aaf.cm.props +## AAF Certificate Manager properties +## 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.cassandra.props:/opt/app/osaaf/local/org.osaaf.cm.ca.props +aaf_component=AAF_NS.cm:2.1.0.0 +port=8150 + +#Certman +cm_public_dir=/opt/app/osaaf/public +cm_trust_cas=AAF_RootCA.cer + + diff --git a/auth/sample/etc/org.osaaf.aaf.fs.props b/auth/sample/etc/org.osaaf.aaf.fs.props new file mode 100644 index 00000000..7307f626 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.fs.props @@ -0,0 +1,9 @@ +## +## org.osaaf.aaf.fs +## AAF Fileserver Properties +## +cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props +aaf_component=AAF_NS.fs:2.1.0.0 +port=8096 + +aaf_public_dir=/opt/app/osaaf/public diff --git a/auth/sample/etc/org.osaaf.aaf.gui.props b/auth/sample/etc/org.osaaf.aaf.gui.props new file mode 100644 index 00000000..619d60f5 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.gui.props @@ -0,0 +1,30 @@ +## +## org.osaaf.aaf.gui +## 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_component=AAF_NS.gui:2.1.0.0 +port=8200 + +aaf_gui_title=AAF +aaf_gui_copyright=(c) 2018 AT&T Intellectual Property. All rights reserved. +aaf_gui_theme=theme/onap +cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login + +# GUI URLS and Help URLS +cm_url=https://aaf.osaaf.org:8150 +gw_url=https://aaf.osaaf.org:8095 +fs_url=http://aaf.osaaf.org:8096 + +aaf_url.gui_onboard=https://wiki.onap.org/display/DW/Client+Onboarding +# aaf_url.cuigui=https://???/Using+the+Command+Prompt + +aaf_url.aaf_help=https://wiki.onap.org/display/DW/Application+Authorization+Framework+Documentation +aaf_url.aaf_help.sub=Bootstrapping+AAF,Installation+Guide +aaf_url.aaf_help.sub.Bootstrapping+AAF=https://wiki.onap.org/display/DW/Bootstrapping+AAF +aaf_url.aaf_help.sub.Installation+Guide=https://wiki.onap.org/display/DW/AAF+Installation+Guide +#aaf_url.cadi_help= +aaf_url.tools=AAF+Projects,AAF+Jira,AAF+Calendar +aaf_url.tool=AAF+Jira=https://jira.onap.org/secure/RapidBoard.jspa?rapidView=69&projectKey=AAF&view=detail&selectedIssue=AAF-134 +aaf_url.tool.AAF+Projects=https://gerrit.onap.org/r/#/admin/projects/?filter=aaf%2F +aaf_url.tool.AAF+Calendar=https://wiki.onap.org/pages/viewpage.action?pageId=6587439 diff --git a/auth/sample/etc/org.osaaf.aaf.hello.props b/auth/sample/etc/org.osaaf.aaf.hello.props new file mode 100644 index 00000000..d26c1049 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.hello.props @@ -0,0 +1,8 @@ +## +## org.osaaf.aaf.hello +## AAF Hello Properties +## +cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props +aaf_component=AAF_NS.hello:2.1.0.0 +port=8130 + diff --git a/auth/sample/etc/org.osaaf.aaf.locate.props b/auth/sample/etc/org.osaaf.aaf.locate.props new file mode 100644 index 00000000..521d63b7 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.locate.props @@ -0,0 +1,8 @@ +## +## 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:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props +aaf_component=AAF_NS.locator:2.1.0.0 +port=8095 + diff --git a/auth/sample/etc/org.osaaf.aaf.log4j.props b/auth/sample/etc/org.osaaf.aaf.log4j.props new file mode 100644 index 00000000..9f108028 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.log4j.props @@ -0,0 +1,51 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +log4j.appender.INIT=org.apache.log4j.DailyRollingFileAppender +log4j.appender.INIT.File=${LOG4J_FILENAME_init} +log4j.appender.INIT.DatePattern='.'yyyy-MM-dd +log4j.appender.INIT.layout=org.apache.log4j.PatternLayout +log4j.appender.INIT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %m %n + +log4j.appender.SRVR=org.apache.log4j.DailyRollingFileAppender +log4j.appender.SRVR.File=${LOG4J_FILENAME_service} +log4j.appender.SRVR.DatePattern='.'yyyy-MM-dd +log4j.appender.SRVR.layout=org.apache.log4j.PatternLayout +log4j.appender.SRVR.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %p [%c] %m %n + +log4j.appender.AUDIT=org.apache.log4j.DailyRollingFileAppender +log4j.appender.AUDIT.File=${LOG4J_FILENAME_audit} +log4j.appender.AUDIT.DatePattern='.'yyyy-MM-dd +log4j.appender.AUDIT.layout=org.apache.log4j.PatternLayout +log4j.appender.AUDIT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %m %n + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] %m %n + +# General Apache libraries +log4j.rootLogger=WARN.SRVR +log4j.logger.org.apache=WARN,SRVR +log4j.logger.com.datastax=WARN,SRVR +log4j.logger.init=INFO,INIT +log4j.logger.service=${LOGGING_LEVEL},SRVR +log4j.logger.audit=INFO,AUDIT +# Additional configs, not cauth with Root Logger +log4j.logger.io.netty=INFO,SRVR +log4j.logger.org.eclipse=INFO,SRVR + + diff --git a/auth/sample/etc/org.osaaf.aaf.oauth.props b/auth/sample/etc/org.osaaf.aaf.oauth.props new file mode 100644 index 00000000..ce67de4d --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.oauth.props @@ -0,0 +1,8 @@ +## +## org.osaaf.aaf.oauth +## 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_component=AAF_NS.oauth:2.1.0.0 +port=8140 + diff --git a/auth/sample/etc/org.osaaf.aaf.orgs.props b/auth/sample/etc/org.osaaf.aaf.orgs.props new file mode 100644 index 00000000..f4210599 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.orgs.props @@ -0,0 +1,11 @@ +# +# Define Organizations for use in some of the components. Not all use them +# +Organization.org.osaaf=org.onap.aaf.org.DefaultOrg +org.osaaf.mailHost=smtp.mail.YOUR.ORG +org.osaaf.mailFrom=YOUR@EMAIL +org.osaaf.default=true +org.osaaf.also_supports=org.osaaf.people + + + diff --git a/auth/sample/etc/org.osaaf.aaf.service.props b/auth/sample/etc/org.osaaf.aaf.service.props new file mode 100644 index 00000000..5472d820 --- /dev/null +++ b/auth/sample/etc/org.osaaf.aaf.service.props @@ -0,0 +1,8 @@ +## +## org.osaaf.aaf.service +## 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_component=AAF_NS.service:2.1.0.0 +port=8100 + diff --git a/auth/sample/etc/org.osaaf.cm.props b/auth/sample/etc/org.osaaf.cm.props deleted file mode 100644 index da5ea872..00000000 --- a/auth/sample/etc/org.osaaf.cm.props +++ /dev/null @@ -1,14 +0,0 @@ -## -## org.osaaf.cm.props -## AAF Certificate Manager properties -## Note: Link to CA Properties in "local" dir -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props:/opt/app/osaaf/local/org.osaaf.cassandra.props:/opt/app/osaaf/local/org.osaaf.cm.ca.props -aaf_component=AAF_NS.cm:2.1.0.0 -port=8150 - -#Certman -cm_public_dir=/opt/app/osaaf/public -cm_trust_cas=AAF_RootCA.cer - - diff --git a/auth/sample/etc/org.osaaf.common.props b/auth/sample/etc/org.osaaf.common.props deleted file mode 100644 index 459d7d7c..00000000 --- a/auth/sample/etc/org.osaaf.common.props +++ /dev/null @@ -1,30 +0,0 @@ -############################################################ -# Common properties for all AAF Components -# on 2018-03-02 06:59.628-0500 -############################################################ -# Pull in Global Coordinates and Certificate Information -aaf_root_ns=org.osaaf.aaf -aaf_trust_perm=org.osaaf.aaf|org.onap|trust - -cadi_prop_files=/opt/app/osaaf/local/org.osaaf.location.props:/opt/app/osaaf/local/org.osaaf.aaf.props -cadi_protocols=TLSv1.1,TLSv1.2 - -aaf_locate_url=https://aaf.osaaf.org:8095 -aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.0 -cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login - -# Standard for this App/Machine -aaf_env=DEV -aaf_data_dir=/opt/app/osaaf/data -cadi_loglevel=DEBUG - -# Domain Support (which will accept) -aaf_domain_support=.com:.org - -# Basic Auth -aaf_default_realm=people.osaaf.org - -# OAuth2 -aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token -aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect - diff --git a/auth/sample/etc/org.osaaf.fs.props b/auth/sample/etc/org.osaaf.fs.props deleted file mode 100644 index 96d91f9d..00000000 --- a/auth/sample/etc/org.osaaf.fs.props +++ /dev/null @@ -1,10 +0,0 @@ -## -## org.osaaf.locator -## AAF Locator Properties -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props -aaf_component=AAF_NS.fs:2.1.0.0 -port=8096 - - -aaf_public_dir=/opt/app/osaaf/public diff --git a/auth/sample/etc/org.osaaf.gui.props b/auth/sample/etc/org.osaaf.gui.props deleted file mode 100644 index 66a3f4c7..00000000 --- a/auth/sample/etc/org.osaaf.gui.props +++ /dev/null @@ -1,30 +0,0 @@ -## -## org.osaaf.locator -## AAF Locator Properties -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props:/opt/app/osaaf/etc/org.osaaf.orgs.props -aaf_component=AAF_NS.gui:2.1.0.0 -port=8200 - -aaf_gui_title=AAF -aaf_gui_copyright=(c) 2018 AT&T Intellectual Property. All rights reserved. -aaf_gui_theme=theme/onap -cadi_loginpage_url=https://AAF_LOCATE_URL/AAF_NS.gui:2.0/login - -# GUI URLS and Help URLS -cm_url=https://aaf.osaaf.org:8150 -gw_url=https://aaf.osaaf.org:8095 -fs_url=http://aaf.osaaf.org:8096 - -aaf_url.gui_onboard=https://wiki.onap.org/display/DW/Client+Onboarding -# aaf_url.cuigui=https://???/Using+the+Command+Prompt - -aaf_url.aaf_help=https://wiki.onap.org/display/DW/Application+Authorization+Framework+Documentation -aaf_url.aaf_help.sub=Bootstrapping+AAF,Installation+Guide -aaf_url.aaf_help.sub.Bootstrapping+AAF=https://wiki.onap.org/display/DW/Bootstrapping+AAF -aaf_url.aaf_help.sub.Installation+Guide=https://wiki.onap.org/display/DW/AAF+Installation+Guide -#aaf_url.cadi_help= -aaf_url.tools=AAF+Projects,AAF+Jira,AAF+Calendar -aaf_url.tool=AAF+Jira=https://jira.onap.org/secure/RapidBoard.jspa?rapidView=69&projectKey=AAF&view=detail&selectedIssue=AAF-134 -aaf_url.tool.AAF+Projects=https://gerrit.onap.org/r/#/admin/projects/?filter=aaf%2F -aaf_url.tool.AAF+Calendar=https://wiki.onap.org/pages/viewpage.action?pageId=6587439 diff --git a/auth/sample/etc/org.osaaf.hello.props b/auth/sample/etc/org.osaaf.hello.props deleted file mode 100644 index 9f77986e..00000000 --- a/auth/sample/etc/org.osaaf.hello.props +++ /dev/null @@ -1,8 +0,0 @@ -## -## org.osaaf.locator -## AAF Locator Properties -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props -aaf_component=AAF_NS.hello:2.1.0.0 -port=8130 - diff --git a/auth/sample/etc/org.osaaf.locate.props b/auth/sample/etc/org.osaaf.locate.props deleted file mode 100644 index d85c735e..00000000 --- a/auth/sample/etc/org.osaaf.locate.props +++ /dev/null @@ -1,8 +0,0 @@ -## -## org.osaaf.locator -## AAF Locator Properties -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props:/opt/app/osaaf/local/org.osaaf.cassandra.props -aaf_component=AAF_NS.locator:2.1.0.0 -port=8095 - diff --git a/auth/sample/etc/org.osaaf.log4j.props b/auth/sample/etc/org.osaaf.log4j.props deleted file mode 100644 index 9f108028..00000000 --- a/auth/sample/etc/org.osaaf.log4j.props +++ /dev/null @@ -1,51 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -log4j.appender.INIT=org.apache.log4j.DailyRollingFileAppender -log4j.appender.INIT.File=${LOG4J_FILENAME_init} -log4j.appender.INIT.DatePattern='.'yyyy-MM-dd -log4j.appender.INIT.layout=org.apache.log4j.PatternLayout -log4j.appender.INIT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %m %n - -log4j.appender.SRVR=org.apache.log4j.DailyRollingFileAppender -log4j.appender.SRVR.File=${LOG4J_FILENAME_service} -log4j.appender.SRVR.DatePattern='.'yyyy-MM-dd -log4j.appender.SRVR.layout=org.apache.log4j.PatternLayout -log4j.appender.SRVR.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %p [%c] %m %n - -log4j.appender.AUDIT=org.apache.log4j.DailyRollingFileAppender -log4j.appender.AUDIT.File=${LOG4J_FILENAME_audit} -log4j.appender.AUDIT.DatePattern='.'yyyy-MM-dd -log4j.appender.AUDIT.layout=org.apache.log4j.PatternLayout -log4j.appender.AUDIT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %m %n - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] %m %n - -# General Apache libraries -log4j.rootLogger=WARN.SRVR -log4j.logger.org.apache=WARN,SRVR -log4j.logger.com.datastax=WARN,SRVR -log4j.logger.init=INFO,INIT -log4j.logger.service=${LOGGING_LEVEL},SRVR -log4j.logger.audit=INFO,AUDIT -# Additional configs, not cauth with Root Logger -log4j.logger.io.netty=INFO,SRVR -log4j.logger.org.eclipse=INFO,SRVR - - diff --git a/auth/sample/etc/org.osaaf.oauth.props b/auth/sample/etc/org.osaaf.oauth.props deleted file mode 100644 index 5be90174..00000000 --- a/auth/sample/etc/org.osaaf.oauth.props +++ /dev/null @@ -1,8 +0,0 @@ -## -## org.osaaf.locator -## AAF Locator Properties -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props:/opt/app/osaaf/local/org.osaaf.cassandra.props -aaf_component=AAF_NS.oauth:2.1.0.0 -port=8140 - diff --git a/auth/sample/etc/org.osaaf.orgs.props b/auth/sample/etc/org.osaaf.orgs.props deleted file mode 100644 index f4210599..00000000 --- a/auth/sample/etc/org.osaaf.orgs.props +++ /dev/null @@ -1,11 +0,0 @@ -# -# Define Organizations for use in some of the components. Not all use them -# -Organization.org.osaaf=org.onap.aaf.org.DefaultOrg -org.osaaf.mailHost=smtp.mail.YOUR.ORG -org.osaaf.mailFrom=YOUR@EMAIL -org.osaaf.default=true -org.osaaf.also_supports=org.osaaf.people - - - diff --git a/auth/sample/etc/org.osaaf.service.props b/auth/sample/etc/org.osaaf.service.props deleted file mode 100644 index 1b4df0e8..00000000 --- a/auth/sample/etc/org.osaaf.service.props +++ /dev/null @@ -1,8 +0,0 @@ -## -## org.osaaf.service -## AAF Service Properties -## -cadi_prop_files=/opt/app/osaaf/etc/org.osaaf.common.props:/opt/app/osaaf/local/org.osaaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.orgs.props -aaf_component=AAF_NS.service:2.1.0.0 -port=8100 - diff --git a/auth/sample/local/.gitignore b/auth/sample/local/.gitignore new file mode 100644 index 00000000..362863ac --- /dev/null +++ b/auth/sample/local/.gitignore @@ -0,0 +1,2 @@ +truststoreONAPall.jks +org.osaaf.aaf.signer.p12 diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props new file mode 100644 index 00000000..6b08d9a0 --- /dev/null +++ b/auth/sample/local/aaf.props @@ -0,0 +1,18 @@ +# +# Special AAF specific Properties... for AAF Init only +# +# Controlling NS +aaf_root_ns=org.osaaf.aaf +aaf_trust_perm=org.osaaf.aaf|org.onap|trust + +# Domains and Realms +aaf_domain_support=.com:.org +aaf_default_realm=people.osaaf.org + +# Initial Passwords and such +aaf_password=osaaf_admin +cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks +cadi_truststore_password=changeit + +# Other +aaf_data_dir=/opt/app/osaaf/data diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props new file mode 100644 index 00000000..f9ad077a --- /dev/null +++ b/auth/sample/local/initialConfig.props @@ -0,0 +1,10 @@ +aaf_env=DEV +aaf_locate_url=https://aaf-onap-test.osaaf.org:8095 +aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect +aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token +aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 +cadi_protocols=TLSv1.1,TLSv1.2 +cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US +cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1 +fs_url=https://AAF_LOCATE_URL/AAF_NS.fs.2.1 +gui_url=https://AAF_LOCATE_URL/AAF_NS.gui.2.1 diff --git a/auth/sample/local/org.osaaf.aaf.cassandra.props b/auth/sample/local/org.osaaf.aaf.cassandra.props new file mode 100644 index 00000000..692e57f9 --- /dev/null +++ b/auth/sample/local/org.osaaf.aaf.cassandra.props @@ -0,0 +1,30 @@ +############################################################ +# Cassandra properties for AAF Components needing +# on 2018-03-02 06:59.628-0500 +############################################################ +# LOCAL Cassandra +cassandra.clusters=cass.aaf.osaaf.org +cassandra.clusters.port=9042 +#need this to be fully qualified name when REAL AAF integration +cassandra.clusters.user=cassandra +cassandra.clusters.password=enc: + +# Name for exception that has happened in the past +cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed" + +# Example Consistency Settings for Clusters with at least instances +#cassandra.writeConsistency.ns=LOCAL_QUORUM +#cassandra.writeConsistency.perm=LOCAL_QUORUM +#cassandra.writeConsistency.role=LOCAL_QUORUM +#cassandra.writeConsistency.user_role=LOCAL_QUORUM +#cassandra.writeConsistency.cred=LOCAL_QUORUM +#cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM + +# Consistency Settings when Single Instance +cassandra.writeConsistency.ns=ONE +cassandra.writeConsistency.perm=ONE +cassandra.writeConsistency.role=ONE +cassandra.writeConsistency.user_role=ONE +cassandra.writeConsistency.cred=ONE +cassandra.writeConsistency.ns_attrib=ONE + diff --git a/auth/sample/local/org.osaaf.aaf.cm.ca.props b/auth/sample/local/org.osaaf.aaf.cm.ca.props new file mode 100644 index 00000000..59242995 --- /dev/null +++ b/auth/sample/local/org.osaaf.aaf.cm.ca.props @@ -0,0 +1,11 @@ +## +## org.osaaf.aaf.cm.ca.props +## Properties to access Certificate Authority +## + +#Certman +cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.cm.p12;aaf_cm_ca;enc: +cm_ca.local.idDomains=org.osaaf +cm_ca.local.baseSubject=/OU=OSAAF/O=ONAP/C=US +cm_ca.local.perm_type=org.osaaf.aaf.ca + diff --git a/auth/sample/local/org.osaaf.aaf.cm.p12 b/auth/sample/local/org.osaaf.aaf.cm.p12 deleted file mode 100644 index 63aedd25..00000000 Binary files a/auth/sample/local/org.osaaf.aaf.cm.p12 and /dev/null differ diff --git a/auth/sample/local/org.osaaf.aaf.keyfile b/auth/sample/local/org.osaaf.aaf.keyfile deleted file mode 100644 index 7206ad93..00000000 --- a/auth/sample/local/org.osaaf.aaf.keyfile +++ /dev/null @@ -1,27 +0,0 @@ -rmaOaytuFLnhz07oilUO0nO_mZ18XInIi56OoezdUTR5f1GR45lp_nX7marcYv7j2ZS-dpWOSur0 -sK5M-ByrgxfUPyk749Ex4nGSMLnAq-nFMaREpGZPmNP-ul_vCxCmaHUnWKPJB4jx_K_osKPb0-ng -tqX0hnpbmcq4okV94MUdUs084ymM5LU-qVU_oYbLUM4dXatobe1go8eX2umrutZbQTjz75i4UEcF -Dv9nDwVqHRGUFMU0NeJlrSlRSO-eiDgVtoSCBGtIkDdKPBTUT3wachHmUBiSBJ3GF05yQP1CwWzz -AQRSwphP11xKI7tSViT5RoxjxfQZiVEbeyg9g9BROe_pLyIDskoW_ujdnPOWRcSIx6Q4J0eew3kb -yqcWUPf1K2nSyBSshlsQ6A9NSOLz_KhyIvP_1OG82m1gir3I77Usl7QqMF8IBXCjJ-H_qqR1u-By -qm_AFjagYA2TgF2YQN-fcneom_5_cA74_xwJ41juhOP72ZWGkX1bAdbiKf85uYo2H3g5HeNWijQL -y4wJ4qFrSptQRyV2Ntf9OLgpOsKsPPiLlNBugmCjHBMaPMbQAYRbsyCH2nKdjjTG3c6iF5Cj9Jco -6McvcrYYuq3ynH-2HoL-T-Zgl2AXLxqK4_dl_H243H-GutoJsmIkELLGS_pCpSt4t7xaDvzqxrTj -4qZ1OjozcpnsqM8HebS28IgoqFaOmrCMqO1MLM_CjAyliTy31P28XEbcYvjEY-FWmnJRSpMLc1Pz --KOH-2V8uTqn5YlUsFt2TNnc8lEwMH6GSV1vkgxwPQaMUgWV2svc0FfBmTLZI4zNmpMu4cGjaG-f -Z8r_hX7pDPANBTaqFxTp999dnaS3lLdZMNbJNEKFF0xxdRuBzsPKDiLa7ItixInZlUcEnwJVWOhC -kcI2J0cEFGxHxWYmYdqyJIvQzjebk6iDqB-mLi0ai-_XYm1niCxZizT_XJADo9LQtTzq1V6pMgYR -PPfbDKoiYRK6D8nbWsGNOh6xOS7zs8qrnTPxwu5CuZX_EFoejmooHTrXEqw2RzRFw9XqXM8p50C3 -YrwI2lA6kTQItGm0yftAxqfbhbjJp_K1P91ckOYL3ZSYze_hXRmguwYuT5NWlKhBtm5aawuDjXEg -yn7PnRTT0smW40hbYbks5L-2VVxTd3tith6Ltqh95miL6vpG5ByDDQlZCWwkq7XH7iScejDvT6UN -jF1K86mNa8CLXuuSzGl1li1CMxoVzW55G3s0-ICDHqjytiUkiUen2V9VzGT9h4BgDfzbShf31M4_ -biO4NL-mkqlDBbh-KcrYjvNj5qQwHSiLSLuQQBoBtJ3hG9jCu4YBYVWJYctV8r3Js_sGDH4rl5w1 -ujEF6QHWZIF73-u53G_LtvoXBnQcrBW8oLpqP-1Pz5d1bio--bRsNa5qAAilNbYmttiKYOYJn4My -c6QvzF81SqTRZy0Fd0NK_hMCglPkH7sd32UX-LBquvQ_yDqB_ml_pADJhWcfuD4iPAQjR2Vgclxf -GPCDva6YpJDzjjnaExDYmGFVFpbIPLfvGUCit_9zAycx0nW1J_cVT1BWFHijjAh_gnIpa6MtY3BE -G3d8ee6_LAQvvVdBwZ955UwyRd-C7Buc7Xcccw-8hcNBKqOCDlE9j4tie2SdO9m53vZRzcLY6Aiw -BiulIAllqHZQYs0OBcaYgbNgJU-gn9ZMWgS9i3ijPvTTBSNX7y7k4L1a4QOceyuOtt7nkv024YUS -acTRmaGotRBuVfI-C0L4Q9NL56_nUATB5ca2GqgLEKnWKsiN3T9cBg4Ji88E8OdiVcoO8segB-0d -QwWCqCZ8_z_R7zBMlDqpfu5wbvoVx0w9JhLgO9f7eoRozqA3qGLv94i1pN6LuU-Q7YPz4jVxmbb_ -2CHyP1n-o1ZWHfWdz6aByXEzrAZdvjfEWwwMYV5l5jFilTXaCNOCjr9S4YjNn0HITdl7E64C06Im -3QWOsnDv9z1APjnFo12KH_1yWscU0t9gx7FG210Ug6C-G3Bko_tm_YOp0Lkum4qrnxgHMf_a \ No newline at end of file diff --git a/auth/sample/local/org.osaaf.aaf.p12 b/auth/sample/local/org.osaaf.aaf.p12 deleted file mode 100644 index ac1dece8..00000000 Binary files a/auth/sample/local/org.osaaf.aaf.p12 and /dev/null differ diff --git a/auth/sample/local/org.osaaf.aaf.props b/auth/sample/local/org.osaaf.aaf.props deleted file mode 100644 index 975f80cc..00000000 --- a/auth/sample/local/org.osaaf.aaf.props +++ /dev/null @@ -1,17 +0,0 @@ -############################################################ -# Properties Generated by AT&T Certificate Manager -# by jg1555 -# on 2018-02-21T10:28:08.909-0600 -# @copyright 2016, AT&T -############################################################ -cm_url=https://aaf.osaaf.org:8150 -#hostname=aaf.osaaf.org -aaf_env=DEV -cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US -cadi_keyfile=/opt/app/osaaf/local/org.osaaf.aaf.keyfile -cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12 -cadi_keystore_password=enc:3O7HDzEzdYatFYb83-jV69MNzN8qIW975SS70qCs7xri0b1n4r5viHo1lrM6K8om -#cadi_key_password=enc: -cadi_alias=aaf-authz@aaf.osaaf.org -cadi_truststore=/opt/app/osaaf/local/org.osaaf.aaf.trust.p12 -cadi_truststore_password=enc:5nzj6v3Rb0oZPV1zCxg8EJFfkFvWFGJflLB0i_FN0Np diff --git a/auth/sample/local/org.osaaf.aaf.trust.p12 b/auth/sample/local/org.osaaf.aaf.trust.p12 deleted file mode 100644 index 1e037def..00000000 Binary files a/auth/sample/local/org.osaaf.aaf.trust.p12 and /dev/null differ diff --git a/auth/sample/local/org.osaaf.cassandra.props b/auth/sample/local/org.osaaf.cassandra.props deleted file mode 100644 index 4489a36b..00000000 --- a/auth/sample/local/org.osaaf.cassandra.props +++ /dev/null @@ -1,29 +0,0 @@ -############################################################ -# Cassandra properties for AAF Components needing -# on 2018-03-02 06:59.628-0500 -############################################################ -# LOCAL Cassandra -cassandra.clusters=cass.aaf.osaaf.org -cassandra.clusters.port=9042 -#need this to be fully qualified name when REAL AAF integration -cassandra.clusters.user=cassandra -cassandra.clusters.password=enc:gF_I93pTRMIvj3rof-dx-yK84XYT1UKGf98s1LAJyWV - -# Name for exception that has happened in the past -cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed" - -# Example Consistency Settings for Clusters with at least instances -#cassandra.writeConsistency.ns=LOCAL_QUORUM -#cassandra.writeConsistency.perm=LOCAL_QUORUM -#cassandra.writeConsistency.role=LOCAL_QUORUM -#cassandra.writeConsistency.user_role=LOCAL_QUORUM -#cassandra.writeConsistency.cred=LOCAL_QUORUM -#cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM - -# Consistency Settings when Single Instance -cassandra.writeConsistency.ns=ONE -cassandra.writeConsistency.perm=ONE -cassandra.writeConsistency.role=ONE -cassandra.writeConsistency.user_role=ONE -cassandra.writeConsistency.cred=ONE -cassandra.writeConsistency.ns_attrib=ONE diff --git a/auth/sample/local/org.osaaf.cm.ca.props b/auth/sample/local/org.osaaf.cm.ca.props deleted file mode 100644 index 8843705c..00000000 --- a/auth/sample/local/org.osaaf.cm.ca.props +++ /dev/null @@ -1,11 +0,0 @@ -## -## org.osaaf.cm.ca.props -## Properties to access Certifiate Authority -## - -#Certman -cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.cm.p12;aaf_cm_ca;enc:asFEWMNqjH7GktBLb9EGl6L1zfS2qMH5ZS5Zd90KVT5B9ZyRsqx7Gb73YllO8Hyw -cm_ca.local.idDomains=org.osaaf -cm_ca.local.baseSubject=/OU=OSAAF/O=ONAP/C=US -cm_ca.local.perm_type=org.osaaf.aaf.ca - diff --git a/auth/sample/local/org.osaaf.location.props b/auth/sample/local/org.osaaf.location.props deleted file mode 100644 index d6d04ef4..00000000 --- a/auth/sample/local/org.osaaf.location.props +++ /dev/null @@ -1,12 +0,0 @@ -## -## org.osaaf.location.props -## -## Localized Machine Information -## -# Almeda California -cadi_latitude=37.78187 -cadi_longitude=-122.26147 - -cadi_registration_hostname=aaf-onap-beijing-test.osaaf.org -cadi_trust_masks=10.12.6/24 - diff --git a/auth/sample/logs/clean b/auth/sample/logs/clean new file mode 100644 index 00000000..e92e1bd3 --- /dev/null +++ b/auth/sample/logs/clean @@ -0,0 +1,6 @@ +for D in `find . -type d`; do + if [ "$D" != "./" ]; then + rm -f $D/*.log + fi +done + diff --git a/auth/sample/logs/taillog b/auth/sample/logs/taillog new file mode 100644 index 00000000..b4482d09 --- /dev/null +++ b/auth/sample/logs/taillog @@ -0,0 +1 @@ +tail -f `find . -name *service*.log -ctime 0` -- cgit 1.2.3-korg