Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
To version 2.1.17-SNAPSHOT
[aaf/authz.git]
/
auth
/
sample
/
bin
/
service.sh
diff --git
a/auth/sample/bin/service.sh
b/auth/sample/bin/service.sh
index
c14754a
..
10a3e15
100644
(file)
--- a/
auth/sample/bin/service.sh
+++ b/
auth/sample/bin/service.sh
@@
-39,7
+39,7
@@
cadi_longitude=${cadi_longitude:-"${LONGITUDE}"}
cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"}
aaf_locate_url=${aaf_locate_url:-"https://${HOSTNAME}:8095"}
cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"}
aaf_locate_url=${aaf_locate_url:-"https://${HOSTNAME}:8095"}
-JAVA=
/usr
/bin/java
+JAVA=
${JAVA_HOME}
/bin/java
OSAAF=/opt/app/osaaf
LOCAL=$OSAAF/local
OSAAF=/opt/app/osaaf
LOCAL=$OSAAF/local
@@
-158,7
+158,6
@@
if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
echo "$S" >> ${TMP}
fi
done
echo "$S" >> ${TMP}
fi
done
-
cat $TMP
$JAVA_AGENT config \
cat $TMP
$JAVA_AGENT config \
@@
-168,6
+167,7
@@
if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
cadi_longitude=${cadi_longitude} \
cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
rm ${TMP}
cadi_longitude=${cadi_longitude} \
cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
rm ${TMP}
+ echo "cm_always_ignore_ips=${cm_always_ignore_ips:=false}" >> $LOCAL/org.osaaf.aaf.props;
# Cassandra Config stuff
# Default is expect a Cassandra on same Node
# Cassandra Config stuff
# Default is expect a Cassandra on same Node