Skip to content

Commit 9dbbdd2

Browse files
IBMRobIBMRob
committed
11.0.0.3 update
1 parent 0616628 commit 9dbbdd2

15 files changed

+214
-166
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ Then set the build argument `ACE_INSTALL` to the name of the ACE file placed in
3838

3939
1. ACE production with MQ Advanced production:
4040
* Ubuntu: `docker build -t ace-mq --build-arg BASE_IMAGE={MQ-image} --build-arg ACE_INSTALL={ACE-file-in-deps-folder} --file ubuntu/Dockerfile.acemq .`
41-
* RedHat Enterprise Linux: `./build.sh ace-mq {ACE-file-in-deps-folder} {mq-base-image-name}`
41+
* RedHat Enterprise Linux: `./build-rhel.sh ace-mq {buildTag} {ACE-file-in-deps-folder} {mq-base-image-name}`
4242
2. ACE for Developers with MQ Advanced for Developers:
4343
* Ubuntu: `docker build -t ace-dev-mq-dev --build-arg ACE_INSTALL={ACE-dev-file-in-deps-folder} --file ubuntu/Dockerfile.acemq .`
44-
* RedHat Enterprise Linux: `./build.sh ace-mq {ACE-file-in-deps-folder} {mq-base-image-name}`
44+
* RedHat Enterprise Linux: `./build-rhel.sh ace-mq {buildTag} {ACE-file-in-deps-folder} {mq-base-image-name}`
4545

4646
**Note:** As mentioned before, the docker file will download the **[Development version of IBM MQ](https://hub.docker.com/r/ibmcom/mq/)** by default unless `BASE_IMAGE` is changed.
4747

@@ -52,10 +52,10 @@ Then set the build argument `ACE_INSTALL` to the name of the ACE file placed in
5252

5353
1. ACE for Developers only:
5454
* Ubuntu: `docker build -t ace-dev-only --build-arg ACE_INSTALL={ACE-dev-file-in-deps-folder} --file ubuntu/Dockerfile.aceonly .`
55-
* RedHat Enterprise Linux: `./build.sh ace-dev-only {ACE-file-in-deps-folder}`
55+
* RedHat Enterprise Linux: `./build-rhel.sh ace-dev-only {buildTag} {ACE-file-in-deps-folder}`
5656
2. ACE production only:
5757
* Ubuntu: `docker build -t ace-only --build-arg ACE_INSTALL={ACE-file-in-deps-folder} --file ubuntu/Dockerfile.aceonly .`
58-
* RedHat Enterprise Linux: `./build.sh ace-only {ACE-file-in-deps-folder}`
58+
* RedHat Enterprise Linux: `./build-rhel.sh ace-only {buildTag} {ACE-file-in-deps-folder}`
5959

6060
# Usage
6161

‎ace_compile_bars.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ if [ -z "$MQSI_VERSION" ]; then
1111
source /opt/ibm/ace-11/server/bin/mqsiprofile
1212
fi
1313

14-
for bar in /home/aceuser/bars/*.bar
15-
do
16-
mqsibar -a $bar -w /home/aceuser/ace-server
17-
done
14+
if ls /home/aceuser/bars/*.bar >/dev/null 2>&1; then
15+
for bar in /home/aceuser/bars/*.bar
16+
do
17+
mqsibar -a $bar -w /home/aceuser/ace-server
18+
done
19+
fi

‎ace_config_bars.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ if [ -z "$MQSI_VERSION" ]; then
1111
source /opt/ibm/ace-11/server/bin/mqsiprofile
1212
fi
1313

14-
for bar in /home/aceuser/initial-config/bars/*.bar
15-
do
16-
mqsibar -a $bar -w /home/aceuser/ace-server
17-
done
14+
if ls /home/aceuser/initial-config/bars/*.bar >/dev/null 2>&1; then
15+
for bar in /home/aceuser/initial-config/bars/*.bar
16+
do
17+
mqsibar -a $bar -w /home/aceuser/ace-server
18+
done
19+
fi

‎ace_config_keystore.sh‎

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,49 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
1212

1313
log "Handling keystore configuration"
1414

15-
if [ -f /home/aceuser/ace-server/keystore.jks ]; then
16-
OUTPUT=$(rm /home/aceuser/ace-server/keystore.jks 2>&1)
17-
logAndExitIfError $? "${OUTPUT}"
18-
fi
19-
20-
IFS=$'\n'
21-
for keyfile in `ls /home/aceuser/initial-config/keystore/*.key`; do
22-
if [ -z "${ACE_KEYSTORE_PASSWORD}" ]; then
23-
log "No keystore password defined"
24-
exit 1
25-
fi
26-
27-
filename=$(basename ${keyfile})
28-
dirname=$(dirname ${keyfile})
29-
alias=$(echo ${filename} | sed -e 's/\.key$'//)
30-
certfile=${dirname}/${alias}.crt
31-
passphrasefile=${dirname}/${alias}.pass
15+
if ls /home/aceuser/initial-config/keystore/*.key >/dev/null 2>&1; then
3216

33-
if [ ! -f ${certfile} ]; then
34-
log "Certificate file ${certfile} not found."
35-
exit 1
17+
if [ $(cat /home/aceuser/initial-config/keystore/*.key | wc -l) -gt 0 ]; then
18+
if [ -f /home/aceuser/ace-server/keystore.jks ]; then
19+
OUTPUT=$(rm /home/aceuser/ace-server/keystore.jks 2>&1)
20+
logAndExitIfError $? "${OUTPUT}"
21+
fi
3622
fi
3723

38-
if [ -f ${passphrasefile} ];then
39-
ACE_PRI_KEY_PASS=$(cat ${passphrasefile})
40-
OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -passin pass:${ACE_PRI_KEY_PASS} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
41-
else
42-
OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
43-
fi
44-
logAndExitIfError $? "${OUTPUT}"
45-
46-
OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importkeystore -srckeystore /home/aceuser/ace-server/keystore.p12 -destkeystore /home/aceuser/ace-server/keystore.jks -srcstorepass ${ACE_KEYSTORE_PASSWORD} -deststorepass ${ACE_KEYSTORE_PASSWORD} -srcalias ${alias} -destalias ${alias} -srcstoretype PKCS12 -noprompt 2>&1)
47-
logAndExitIfError $? "${OUTPUT}"
48-
49-
OUTPUT=$(rm /home/aceuser/ace-server/keystore.p12 2>&1)
50-
logAndExitIfError $? "${OUTPUT}"
51-
done
24+
IFS=$'\n'
25+
for keyfile in `ls /home/aceuser/initial-config/keystore/*.key`; do
26+
if [ -s "${keyfile}" ]; then
27+
if [ -z "${ACE_KEYSTORE_PASSWORD}" ]; then
28+
log "No keystore password defined"
29+
exit 1
30+
fi
31+
32+
filename=$(basename ${keyfile})
33+
dirname=$(dirname ${keyfile})
34+
alias=$(echo ${filename} | sed -e 's/\.key$'//)
35+
certfile=${dirname}/${alias}.crt
36+
passphrasefile=${dirname}/${alias}.pass
37+
38+
if [ ! -f ${certfile} ]; then
39+
log "Certificate file ${certfile} not found."
40+
exit 1
41+
fi
42+
43+
if [ -f ${passphrasefile} ];then
44+
ACE_PRI_KEY_PASS=$(cat ${passphrasefile})
45+
OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -passin pass:${ACE_PRI_KEY_PASS} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
46+
else
47+
OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
48+
fi
49+
logAndExitIfError $? "${OUTPUT}"
50+
51+
OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importkeystore -srckeystore /home/aceuser/ace-server/keystore.p12 -destkeystore /home/aceuser/ace-server/keystore.jks -srcstorepass ${ACE_KEYSTORE_PASSWORD} -deststorepass ${ACE_KEYSTORE_PASSWORD} -srcalias ${alias} -destalias ${alias} -srcstoretype PKCS12 -noprompt 2>&1)
52+
logAndExitIfError $? "${OUTPUT}"
53+
54+
OUTPUT=$(rm /home/aceuser/ace-server/keystore.p12 2>&1)
55+
logAndExitIfError $? "${OUTPUT}"
56+
fi
57+
done
58+
fi
5259

5360
log "Keystore configuration complete"

‎ace_config_odbcini.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
1616

1717
log "Handling odbcini configuration"
1818

19-
ODBCINI=/home/aceuser/ace-server/odbc.ini
19+
if [ -s "/home/aceuser/initial-config/odbcini/odbc.ini"]; then
20+
ODBCINI=/home/aceuser/ace-server/odbc.ini
21+
cp /home/aceuser/initial-config/odbcini/odbc.ini ${ODBCINI}
22+
fi
2023

21-
cp /home/aceuser/initial-config/odbcini/odbc.ini ${ODBCINI}
24+
log "Odbcini configuration complete"

‎ace_config_policy.sh‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,17 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
1313
log "Handling policy configuration"
1414

1515
mkdir /home/aceuser/ace-server/overrides/DefaultPolicies
16-
cp /home/aceuser/initial-config/policy/*.policyxml /home/aceuser/ace-server/overrides/DefaultPolicies/.
17-
cp /home/aceuser/initial-config/policy/policy.descriptor /home/aceuser/ace-server/overrides/DefaultPolicies/policy.descriptor
16+
17+
if ls /home/aceuser/initial-config/policy/*.policyxml >/dev/null 2>&1; then
18+
for policyfile in `ls /home/aceuser/initial-config/policy/*.policyxml`; do
19+
if [ -s "${policyfile}" ]; then
20+
cp "${policyfile}" /home/aceuser/ace-server/overrides/DefaultPolicies/.
21+
fi
22+
done
23+
fi
24+
25+
if [ -s "/home/aceuser/initial-config/policy/policy.descriptor" ]; then
26+
cp /home/aceuser/initial-config/policy/policy.descriptor /home/aceuser/ace-server/overrides/DefaultPolicies/policy.descriptor
27+
fi
1828

1929
log "Policy configuration complete"

‎ace_config_serverconf.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
1212

1313
log "Handling server.conf configuration"
1414

15-
cp /home/aceuser/initial-config/serverconf/server.conf.yaml /home/aceuser/ace-server/overrides/server.conf.yaml
15+
if [ -s "/home/aceuser/initial-config/serverconf/server.conf.yaml" ]; then
16+
cp /home/aceuser/initial-config/serverconf/server.conf.yaml /home/aceuser/ace-server/overrides/server.conf.yaml
17+
fi
1618

1719
log "server.conf configuration complete"

‎ace_config_setdbparms.sh‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,22 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
1616

1717
log "Handling setdbparms configuration"
1818

19-
FILE=/home/aceuser/initial-config/setdbparms/setdbparms.txt
20-
21-
if [ ! -f $FILE ]; then
22-
log "File not found: ${FILE}"
23-
exit 1
19+
if [ -s "/home/aceuser/initial-config/setdbparms/setdbparms.txt"]; then
20+
FILE=/home/aceuser/initial-config/setdbparms/setdbparms.txt
21+
22+
OLDIFS=${IFS}
23+
IFS=$'\n'
24+
for line in $(cat $FILE | tr -d '\r'); do
25+
if [[ $line =~ ^\# ]]; then
26+
continue
27+
fi
28+
IFS=${OLDIFS}
29+
fields=($line)
30+
log "Setting user and password for resource ${fields[0]}"
31+
32+
OUTPUT=$(mqsisetdbparms -w /home/aceuser/ace-server -n ${fields[0]} -u ${fields[1]} -p ${fields[2]} 2>&1)
33+
logAndExitIfError $? "${OUTPUT}"
34+
done
2435
fi
2536

26-
OLDIFS=${IFS}
27-
IFS=$'\n'
28-
for line in $(cat $FILE | tr -d '\r'); do
29-
if [[ $line =~ ^\# ]]; then
30-
continue
31-
fi
32-
IFS=${OLDIFS}
33-
fields=($line)
34-
log "Setting user and password for resource ${fields[0]}"
35-
36-
OUTPUT=$(mqsisetdbparms -w /home/aceuser/ace-server -n ${fields[0]} -u ${fields[1]} -p ${fields[2]} 2>&1)
37-
logAndExitIfError $? "${OUTPUT}"
38-
done
39-
4037
log "setdbparms configuration complete"

‎ace_config_truststore.sh‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,29 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
1212

1313
log "Handling truststore configuration"
1414

15-
if [ -f /home/aceuser/ace-server/truststore.jks ]; then
16-
OUTPUT=$(rm /home/aceuser/ace-server/truststore.jks 2>&1)
17-
logAndExitIfError $? "${OUTPUT}"
18-
fi
15+
if ls /home/aceuser/initial-config/truststore/*.crt >/dev/null 2>&1; then
1916

20-
IFS=$'\n'
21-
for file in `ls /home/aceuser/initial-config/truststore/*.crt`; do
22-
if [ -z "${ACE_TRUSTSTORE_PASSWORD}" ]; then
23-
log "No truststore password defined"
24-
exit 1
17+
if [ $(cat /home/aceuser/initial-config/truststore/*.crt | wc -l) -gt 0 ]; then
18+
if [ -f /home/aceuser/ace-server/truststore.jks ]; then
19+
OUTPUT=$(rm /home/aceuser/ace-server/truststore.jks 2>&1)
20+
logAndExitIfError $? "${OUTPUT}"
21+
fi
2522
fi
2623

27-
filename=$(basename $file)
28-
alias=$(echo $filename | sed -e 's/\.crt$'//)
29-
OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importcert -trustcacerts -alias ${filename} -file ${file} -keystore /home/aceuser/ace-server/truststore.jks -storepass ${ACE_TRUSTSTORE_PASSWORD} -noprompt 2>&1)
30-
logAndExitIfError $? "${OUTPUT}"
31-
done
24+
IFS=$'\n'
25+
for file in `ls /home/aceuser/initial-config/truststore/*.crt`; do
26+
if [ -s "${file}" ]; then
27+
if [ -z "${ACE_TRUSTSTORE_PASSWORD}" ]; then
28+
log "No truststore password defined"
29+
exit 1
30+
fi
31+
32+
filename=$(basename $file)
33+
alias=$(echo $filename | sed -e 's/\.crt$'//)
34+
OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importcert -trustcacerts -alias ${filename} -file ${file} -keystore /home/aceuser/ace-server/truststore.jks -storepass ${ACE_TRUSTSTORE_PASSWORD} -noprompt 2>&1)
35+
logAndExitIfError $? "${OUTPUT}"
36+
fi
37+
done
38+
fi
3239

3340
log "Truststore configuration complete"

‎ace_config_webusers.sh‎

Lines changed: 48 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,49 +18,62 @@ log "Handling webusers configuration"
1818

1919
ADMINUSERSFILE=/home/aceuser/initial-config/webusers/admin-users.txt
2020
VIEWERUSERSFILE=/home/aceuser/initial-config/webusers/viewer-users.txt
21+
DASHBOARDUSERSFILE=/home/aceuser/initial-config/webusers/dashboard-users.txt
2122

22-
if [ ! -f $ADMINUSERSFILE ]; then
23-
log "File not found: ${ADMINUSERSFILE}"
24-
exit 1
25-
fi
23+
if [ -s $ADMINUSERSFILE ] || [ -s $VIEWERUSERSFILE ] || [ -s $DASHBOARDUSERSFILE ]; then
24+
OUTPUT=$(mqsichangeauthmode -w /home/aceuser/ace-server -s active -m file 2>&1)
25+
logAndExitIfError $? "${OUTPUT}"
2626

27-
if [ ! -f $VIEWERUSERSFILE ]; then
28-
log "File not found: ${VIEWERUSERSFILE}"
29-
exit 1
30-
fi
27+
OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r admin -p all+ 2>&1)
28+
logAndExitIfError $? "${OUTPUT}"
3129

32-
OUTPUT=$(mqsichangeauthmode -w /home/aceuser/ace-server -s active -m file 2>&1)
33-
logAndExitIfError $? "${OUTPUT}"
30+
OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r viewer -p read+ 2>&1)
31+
logAndExitIfError $? "${OUTPUT}"
3432

35-
OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r admin -p all+ 2>&1)
36-
logAndExitIfError $? "${OUTPUT}"
33+
OLDIFS=${IFS}
3734

38-
OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r viewer -p read+ 2>&1)
39-
logAndExitIfError $? "${OUTPUT}"
35+
if [ -s $ADMINUSERSFILE ]; then
36+
IFS=$'\n'
37+
for line in $(cat $ADMINUSERSFILE | tr -d '\r'); do
38+
if [[ $line =~ ^\# ]]; then
39+
continue
40+
fi
41+
IFS=${OLDIFS}
42+
fields=($line)
43+
log "Creating admin user ${fields[0]}"
4044

41-
OLDIFS=${IFS}
42-
IFS=$'\n'
43-
for line in $(cat $ADMINUSERSFILE | tr -d '\r'); do
44-
if [[ $line =~ ^\# ]]; then
45-
continue
45+
OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r admin 2>&1)
46+
logAndExitIfError $? "${OUTPUT}"
47+
done
4648
fi
47-
IFS=${OLDIFS}
48-
fields=($line)
49-
log "Creating admin user ${fields[0]}"
5049

51-
OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r admin 2>&1)
52-
logAndExitIfError $? "${OUTPUT}"
53-
done
50+
if [ -s $VIEWERUSERSFILE ]; then
51+
IFS=$'\n'
52+
for line in $(cat $VIEWERUSERSFILE | tr -d '\r'); do
53+
if [[ $line =~ ^\# ]]; then
54+
continue
55+
fi
56+
IFS=${OLDIFS}
57+
fields=($line)
58+
log "Creating viewer user ${fields[0]}"
5459

55-
IFS=$'\n'
56-
for line in $(cat $VIEWERUSERSFILE | tr -d '\r'); do
57-
if [[ $line =~ ^\# ]]; then
58-
continue
60+
OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
61+
logAndExitIfError $? "${OUTPUT}"
62+
done
5963
fi
60-
IFS=${OLDIFS}
61-
fields=($line)
62-
log "Creating viewer user ${fields[0]}"
6364

64-
OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
65-
logAndExitIfError $? "${OUTPUT}"
66-
done
65+
if [ -s $DASHBOARDUSERSFILE ]; then
66+
IFS=$'\n'
67+
for line in $(cat $DASHBOARDUSERSFILE | tr -d '\r'); do
68+
if [[ $line =~ ^\# ]]; then
69+
continue
70+
fi
71+
IFS=${OLDIFS}
72+
fields=($line)
73+
log "Creating viewer user ${fields[0]}"
74+
75+
OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
76+
logAndExitIfError $? "${OUTPUT}"
77+
done
78+
fi
79+
fi

0 commit comments

Comments
 (0)