diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-07-19 16:44:02 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-07-19 16:44:13 -0500 |
| commit | 87da9feacd0abb0d60b98cc00c4755121fc73bbb (patch) | |
| tree | e916ccb1420b7fcfa04f19d7db3965e53d0fe119 /auth | |
| parent | 32cdd553a8668e6d03a9cf5b11b360d35a63c87f (diff) | |
add check and showpass
Issue-ID: AAF-378
Change-Id: If06c33ffd45eb61ab881cdb89f9689dae951f82c
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java | 2 | ||||
| -rw-r--r-- | auth/docker/.gitignore | 1 | ||||
| -rw-r--r-- | auth/docker/aaf.props | 15 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 1 | ||||
| -rw-r--r-- | auth/sample/bin/client.sh | 9 |
5 files changed, 16 insertions, 12 deletions
diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java index af2d2f6b..893e9f32 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java @@ -203,7 +203,7 @@ public class LocalCA extends CA { public X509andChain sign(Trans trans, CSRMeta csrmeta) throws IOException, CertException { GregorianCalendar gc = new GregorianCalendar(); Date start = gc.getTime(); - gc.add(GregorianCalendar.MONTH, 2); + gc.add(GregorianCalendar.MONTH, 6); Date end = gc.getTime(); X509Certificate x509; TimeTaken tt = trans.start("Create/Sign Cert",Env.SUB); diff --git a/auth/docker/.gitignore b/auth/docker/.gitignore index a03737d0..c058b043 100644 --- a/auth/docker/.gitignore +++ b/auth/docker/.gitignore @@ -1,2 +1,3 @@ local d.props +aaf.props diff --git a/auth/docker/aaf.props b/auth/docker/aaf.props index 8d18f55d..5c654806 100644 --- a/auth/docker/aaf.props +++ b/auth/docker/aaf.props @@ -1,14 +1,11 @@ -FQI=clamp@clamp.onap.org -VOLUME=clamp_aaf -LONGITUDE=-92 -FQDN=meriadoc.mithril.sbc.com VERSION=2.1.2-SNAPSHOT -DRIVER=local -LATITUDE=38 -FQDN_IP=192.168.99.100 AAF_FQDN=meriadoc.mithril.sbc.com -AAF_AAF_FQDN_IP=192.168.99.100 DEPLOY_FQI=deployer@people.osaaf.org -DEPLOY_PASSWORD=demo123456! APP_FQDN=meriadoc.mithril.sbc.com APP_FQI=clamp@clamp.onap.org +VOLUME=clamp_aaf +DRIVER=local +LATITUDE=38.432899 +LONGITUDE=-90.43248 +AAF_AAF_FQDN_IP=192.168.99.100 +DEPLOY_PASSWORD=demo123456! diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index 10ca9d95..da0b9b64 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -24,7 +24,6 @@ docker build -t ${ORG}/${PROJECT}/aaf_agent:${VERSION} sample # Clean up rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar cd - - ######## # Second, build a core Docker Image echo Building aaf_$AAF_COMPONENT... diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh index 2c736142..46c85be9 100644 --- a/auth/sample/bin/client.sh +++ b/auth/sample/bin/client.sh @@ -87,9 +87,16 @@ if [ ! "$CMD" = "" ]; then rsync -uh --exclude=.gitignore /opt/app/aaf_config/$D/* /opt/app/osaaf/$D done ;; + showpass) + echo "## Show Passwords" + $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar showpass ${APP_FQI} ${APP_FQDN} + ;; + check) + $JAVA -Dcadi_prop_files=/opt/app/osaaf/local/${NS}.props -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar check ${APP_FQI} ${APP_FQDN} + ;; validate) echo "## validate requested" - $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar validate cadi_prop_files=/opt/app/osaaf/local/${NS}.props + $JAVA -jar /opt/app/aaf_config/bin/aaf-cadi-aaf-*-full.jar validate /opt/app/osaaf/local/${NS}.props ;; bash) if [ ! -e ~/.bash_aliases ]; then |