Skip to content

Commit d394731

Browse files
trajanotrajano
committed
Revert "Added support for Dynamic Routing"
This reverts commit a591f5b.
1 parent a591f5b commit d394731

File tree

4 files changed

+63
-48
lines changed

4 files changed

+63
-48
lines changed

‎src/docker/webserver/DockerFile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ RUN /opt/ibm/wlp/bin/installUtility install --acceptLicense restConnector-2.0 re
4343
# Add include to the configuration file
4444
RUN mkdir /share
4545
COPY startHttpServer.sh /work/
46-
COPY defaultClusterPlugin.conf plugin-cfg.xml /opt/IBM/HTTPServer/conf/
46+
COPY defaultClusterPlugin.conf /opt/IBM/HTTPServer/conf/
47+
COPY plugin-cfg.xml /opt/IBM/HTTPServer/conf/
4748
RUN echo "Include /opt/IBM/HTTPServer/conf/defaultClusterPlugin.conf" >> /opt/IBM/HTTPServer/conf/httpd.conf
4849

4950
#RUN mkdir /var/run/sshd

‎src/docker/webserver/defaultClusterPlugin.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
LoadModule ibm_ssl_module modules/mod_ibm_ssl.so
22
#LoadModule was_ap22_module /opt/IBM/WebSphere/Plugins/bin/64bits/mod_was_ap22_http.so
33
LoadModule was_ap24_module /opt/IBM/WebSphere/Plugins/bin/64bits/mod_was_ap24_http.so
4-
#WebSpherePluginConfig "/defaultCluster-plugin-cfg.xml"
5-
WebSpherePluginConfig "/opt/IBM/HTTPServer/conf/plugin-cfg.xml"
4+
WebSpherePluginConfig "/defaultCluster-plugin-cfg.xml"
5+
#WebSpherePluginConfig "/opt/IBM/HTTPServer/conf/plugin-cfg.xml"
66

77
Listen 443
88
<VirtualHost *:443>

‎src/docker/webserver/plugin-cfg.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Property name="uri" value="/ibm/api/dynamicRouting"/>
1515
<Connector host="controller" port="9443" protocol="https">
1616
<Property name="keyring" value="/opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb"/>
17-
<Property name="stashfile" value="/opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.sth"/>
1817
</Connector>
1918
</ConnectorCluster>
2019
<Property name="RoutingRulesConnectorClusterName" value="defaultCollective"/>

‎src/docker/webserver/startHttpServer.sh

Lines changed: 59 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,57 +24,72 @@ echo $PASSWORD
2424

2525
mkdir -p /opt/IBM/WebSphere/Plugins/config/webserver1
2626
gskcapicmd -keydb -create -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb -pw $PASSWORD -stash
27+
# Keep on trying until the configuration file is generated
28+
while [ ! -e /defaultCluster-plugin-cfg.xml ]
29+
do
30+
sleep 0.1 # wait for 1/10 of the second before check again
31+
/opt/ibm/wlp/bin/pluginUtility generate \
32+
--server=adminUser:adminPassword@controller:9443 \
33+
--cluster=defaultCluster
34+
done
2735

28-
# # Keep on trying until the configuration file is generated
29-
# while [ ! -e /defaultCluster-plugin-cfg.xml ]
30-
# do
31-
# sleep 0.1 # wait for 1/10 of the second before check again
32-
# /opt/ibm/wlp/bin/pluginUtility generate \
33-
# --server=adminUser:adminPassword@controller:9443 \
34-
# --cluster=defaultCluster
35-
# done
36+
# Manipulate text to extract the host names of the cluster
37+
for memberHost in $( grep "9443" /defaultCluster-plugin-cfg.xml | sed -n 's/^.*Hostname="\([0-9a-f]*\)".*/\1/p' )
38+
do
39+
echo QUIT | openssl s_client -showcerts -connect $memberHost:9443 > $memberHost.pem
40+
gskcapicmd -cert -import \
41+
-type p12 \
42+
-file $memberHost.pem \
43+
-target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
44+
-target-pw $PASSWORD
45+
done
3646

37-
# # Manipulate text to extract the host names of the cluster
38-
# for memberHost in $( grep "9443" /defaultCluster-plugin-cfg.xml | sed -n 's/^.*Hostname="\([0-9a-f]*\)".*/\1/p' )
39-
# do
40-
# echo QUIT | openssl s_client -showcerts -connect $memberHost:9443 > $memberHost.pem
41-
# gskcapicmd -cert -import \
42-
# -type p12 \
43-
# -file $memberHost.pem \
44-
# -target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
45-
# -target-pw $PASSWORD
46-
# done
47+
# Remove the administrative URIs from the configuration
48+
sed -i 's#<Uri AffinityCookie="JSESSIONID" AffinityURLIdentifier="jsessionid" Name="/IBMJMXConnectorREST/\*"/>##' /defaultCluster-plugin-cfg.xml
49+
sed -i 's#<Uri AffinityCookie="JSESSIONID" AffinityURLIdentifier="jsessionid" Name="/ibm/api/\*"/>##' /defaultCluster-plugin-cfg.xml
4750

48-
# # Remove the administrative URIs from the configuration
49-
# sed -i 's#<Uri AffinityCookie="JSESSIONID" AffinityURLIdentifier="jsessionid" Name="/IBMJMXConnectorREST/\*"/>##' /defaultCluster-plugin-cfg.xml
50-
# sed -i 's#<Uri AffinityCookie="JSESSIONID" AffinityURLIdentifier="jsessionid" Name="/ibm/api/\*"/>##' /defaultCluster-plugin-cfg.xml
51+
# /opt/ibm/wlp/bin/dynamicRouting genKeystore \
52+
# --host=controller \
53+
# --user=adminUser \
54+
# --password=adminPassword \
55+
# --port=9443 \
56+
# --keystorePassword="$PASSWORD" \
57+
# --autoAcceptCertificates
5158

52-
/opt/ibm/wlp/bin/dynamicRouting genKeystore \
53-
--host=controller \
54-
--user=adminUser \
55-
--password=adminPassword \
56-
--port=9443 \
57-
--keystorePassword="$PASSWORD" \
58-
--autoAcceptCertificates
59+
# /opt/ibm/wlp/bin/dynamicRouting genKeystore --host=controller --user=adminUser --password=adminPassword --port=9443 --keystorePassword=foofoo --autoAcceptCertificates
5960

61+
# +CXlp+VS1yOKDqzSp21Jtd1RWfX4cM5Bh1UKfqNA2HU=
6062
# Convert to .p12 first to make it work with gskcapicmd
6163
mkdir -p /opt/IBM/WebSphere/Plugins/config/webserver1
62-
gskcmd -keydb -convert \
63-
-pw $PASSWORD \
64-
-db /plugin-key.jks \
65-
-target /tmp/plugin-key.p12 \
66-
-new_format p12 \
67-
-stash
68-
gskcapicmd -cert -import \
69-
-pw $PASSWORD \
70-
-type p12 \
71-
-file /tmp/plugin-key.p12 \
72-
-target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
73-
-target_pw $PASSWORD
74-
gskcapicmd -cert -setdefault \
75-
-label default \
76-
-db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
77-
-pw $PASSWORD
64+
# /opt/IBM/HTTPServer/bin/gskcmd -keydb -convert \
65+
# -pw "$PASSWORD" \
66+
# -db /plugin-key.jks \
67+
# -target /tmp/plugin-key.p12 \
68+
# -new_format p12
69+
# /opt/IBM/HTTPServer/bin/gskcapicmd -keydb -convert \
70+
# -pw "$PASSWORD" \
71+
# -db /tmp/plugin-key.p12 \
72+
# -target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
73+
# -new_format cms
74+
# /opt/IBM/HTTPServer/bin/gskcapicmd -cert -setdefault \
75+
# -pw "$PASSWORD" \
76+
# -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
77+
# -label default
78+
79+
# cat /opt/IBM/HTTPServer/conf/java.security.append >> /opt/IBM/HTTPServer/java/8.0/jre/lib/security/java.security
80+
# gskcmd -keydb -convert \
81+
# -pw "$PASSWORD" \
82+
# -db /plugin-key.jks \
83+
# -target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
84+
# -new_format cms \
85+
# -stash && \
86+
# gskcmd -cert -setdefault \
87+
# -stashed \
88+
# -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
89+
# -label default
90+
7891

7992
mkdir -p /opt/IBM/WebSphere/Plugins/logs/webserver1
93+
#mv /tmp/plugin-key.* /opt/IBM/WebSphere/Plugins/config/webserver1
94+
8095
exec /work/ihsstart.sh

0 commit comments

Comments
 (0)