Skip to content

Commit

Permalink
Change security file formatting and docker-compose.yml image sources
Browse files Browse the repository at this point in the history
  • Loading branch information
nalakagunathilaka committed Jan 13, 2021
1 parent 7ec8ad9 commit 9472d2d
Show file tree
Hide file tree
Showing 31 changed files with 10 additions and 54 deletions.
8 changes: 4 additions & 4 deletions docker-compose/obam-obiam-with-obbi/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ services:

obbi-worker:
container_name: obbi-worker
image: wso2-obbi-worker:2.0.0
image: docker.wso2.com/wso2-obbi-worker
healthcheck:
test: ["CMD", "nc", "-z", "localhost", "9445"]
interval: 10s
Expand All @@ -70,7 +70,7 @@ services:

obbi-dashboard:
container_name: obbi-dashboard
image: wso2-obbi-dashboard:2.0.0
image: docker.wso2.com/wso2-obbi-dashboard
healthcheck:
test: ["CMD", "nc", "-z", "localhost", "9649"]
interval: 10s
Expand All @@ -96,7 +96,7 @@ services:

obiam:
container_name: obiam
image: wso2-obiam:2.0.0
image: docker.wso2.com/wso2-obiam
healthcheck:
test: ["CMD", "curl", "-k", "-f", "https://localhost:9446/carbon/admin/login.jsp"]
interval: 10s
Expand All @@ -121,7 +121,7 @@ services:

obam:
container_name: obam
image: wso2-obam:2.0.0
image: docker.wso2.com/wso2-obam
healthcheck:
test: ["CMD", "curl", "-k", "-f", "https://localhost:9443/carbon/admin/login.jsp"]
interval: 10s
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
~ under the License.
-->

<parameter name="SSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">


<parameter name="SSLProfiles">
<profile>
<bindAddress>0.0.0.0</bindAddress>
<KeyStore>
Expand All @@ -36,4 +34,3 @@
<SSLVerifyClient>optional</SSLVerifyClient>
</profile>
</parameter>

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright (c) 2018, WSO2 Inc. (http://wso2.com) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->

<parameter name="customSSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">
<parameter name="customSSLProfiles">
<profile>
<servers>*</servers>
<KeyStore>
<KeyStore>
<Location>repository/resources/security/wso2carbon.jks</Location>
<Type>JKS</Type>
<Password>wso2carbon</Password>
Expand All @@ -33,4 +15,3 @@
</TrustStore>
</profile>
</parameter>

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
~ under the License.
-->

<parameter name="SSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">


<parameter name="SSLProfiles">
<profile>
<bindAddress>0.0.0.0</bindAddress>
<KeyStore>
Expand All @@ -36,4 +34,3 @@
<SSLVerifyClient>optional</SSLVerifyClient>
</profile>
</parameter>

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright (c) 2018, WSO2 Inc. (http://wso2.com) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->

<parameter name="customSSLProfiles" xmlns:svns="http://org.wso2.securevault/configuration">
<parameter name="customSSLProfiles">
<profile>
<servers>*</servers>
<KeyStore>
<KeyStore>
<Location>repository/resources/security/wso2carbon.jks</Location>
<Type>JKS</Type>
<Password>wso2carbon</Password>
Expand All @@ -33,4 +15,3 @@
</TrustStore>
</profile>
</parameter>

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 9472d2d

Please sign in to comment.