Skip to content

Commit ada2a12

Browse files
Update rabbiitmq configuration for proxy
1 parent 10a1ebe commit ada2a12

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

selenium/bin/components/forward-proxy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ init_forward-proxy() {
1919
print "> PROXY_HOSTNAME: ${PROXY_HOSTNAME}"
2020
print "> PROXY_PORT: ${PROXY_PORT}"
2121

22-
generate-ca-server-client-kpi forward-proxy $HTTPD_CONFIG_DIR
22+
# generate-ca-server-client-kpi forward-proxy $HTTPD_CONFIG_DIR
2323
}
2424

2525
start_forward-proxy() {
@@ -33,14 +33,12 @@ start_forward-proxy() {
3333
mkdir -p $MOUNT_HTTPD_CONFIG_DIR
3434
${BIN_DIR}/gen-httpd-conf ${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
3535
print "> EFFECTIVE HTTPD_CONFIG_FILE: $MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
36-
cp ${HTTPD_CONFIG_DIR}/*.pem $MOUNT_HTTPD_CONFIG_DIR
3736

3837
docker run \
3938
--detach \
4039
--name forward-proxy \
4140
--net ${DOCKER_NETWORK} \
4241
--publish 9092:9092 \
43-
-v ${TEST_CONFIG_DIR}/${PROXIED_OAUTH_PROVIDER}/ca_${PROXIED_OAUTH_PROVIDER}_certificate.pem:/usr/local/share/ca-certificates/ca_${PROXIED_OAUTH_PROVIDER}_certificate.crt \
4442
--mount "type=bind,source=${MOUNT_HTTPD_CONFIG_DIR},target=/usr/local/apache2/conf" \
4543
${HTTPD_DOCKER_IMAGE}
4644

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export FORWARD_PROXY_CERTS=/usr/local/apache2/conf
2-
export FORWARD_PROXY_CA_CERT=${FORWARD_PROXY_CERTS}/ca_forward-proxy_certificate.pem
3-
export FORWARD_PROXY_URL=https://forward-proxy:9092
1+
export FORWARD_PROXY_URL=http://forward-proxy:9092
42
export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
5-
export PROXIED_OAUTH_PROVIDER=keycloak
3+
export OAUTH_PROVIDER_CA_CERT=${KEYCLOAK_CA_CERT}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export FORWARD_PROXY_CERTS=selenium/test/oauth/forward-proxy
2-
export FORWARD_PROXY_CA_CERT=${FORWARD_PROXY_CERTS}/ca_forward-proxy_certificate.pem
3-
export FORWARD_PROXY_URL=https://forward-proxy:9092
1+
export FORWARD_PROXY_URL=http://forward-proxy:9092
42
export OAUTH_PROVIDER_URL=${KEYCLOAK_URL}
5-
export PROXIED_OAUTH_PROVIDER=keycloak
3+
export OAUTH_PROVIDER_CA_CERT=${KEYCLOAK_CA_CERT}

0 commit comments

Comments
 (0)