Merge pull request #451 from RakhithaRR/iskm-dc

Add config improvements to iskm docker-compose

docker-compose/apim-is-as-km-with-analytics/conf/apim/repository/conf/deployment.toml

@@ -11,7 +11,12 @@ password = "admin"
 create_admin_account = true
 
 [user_store]
-type = "database_unique_id"
+# type = "database_unique_id"
+type = "read_write_ldap_unique_id"
+connection_url = "ldap://is-as-km:10390"
+connection_name = "uid=admin,ou=system"
+connection_password = "admin"
+base_dn = "dc=wso2,dc=org"
 
 [database.apim_db]
 type = "mysql"
@@ -101,7 +106,7 @@ config_endpoint = "https://analytics-event-auth.choreo.dev/auth/v1"
 auth_token = "<on-prem-key>"
 
 [apim.key_manager]
-service_url = "https://is-as-km:${mgt.transport.https.port}/services/"
+service_url = "https://is-as-km:9444/services/"
 type = "WSO2-IS"
 #username = "$ref{super_admin.username}"
 #password = "$ref{super_admin.password}"

docker-compose/apim-is-as-km-with-analytics/conf/is-as-km/repository/conf/deployment.toml

@@ -1,5 +1,6 @@
 [server]
 hostname = "localhost"
+offset = 1
 node_ip = "127.0.0.1"
 base_path = "https://$ref{server.hostname}:${carbon.management.port}"
 
@@ -85,10 +86,10 @@ type = "org.wso2.carbon.identity.core.handler.AbstractIdentityHandler"
 name = "org.wso2.is.notification.ApimOauthEventInterceptor"
 order = 1
 [event_listener.properties]
-notification_endpoint = "https://localhost:9443/internal/data/v1/notify"
+notification_endpoint = "https://api-manager:9443/internal/data/v1/notify"
 username = "${admin.username}"
 password = "${admin.password}"
-'header.X-WSO2-KEY-MANAGER' = "WSO2IS"
+'header.X-WSO2-KEY-MANAGER' = "WSO2-IS"
 
 [[resource.access_control]]
 context = "(.)/keymanager-operations/user-info/claims(.)"
@@ -125,6 +126,13 @@ http_method = "PUT"
 permissions = "/permission/admin/manage/identity/applicationmgt/update"
 scopes = "internal_application_mgt_update"
 
+[[resource.access_control]]
+context = "(.)/keymanager-operations/dcr/register(.)"
+secure = true
+http_method = "POST"
+permissions = "/permission/admin/manage/identity/applicationmgt/update"
+scopes = "internal_application_mgt_update"
+
 [[resource.access_control]]
 context = "(.*)/keymanager-operations/dcr/register(.*)"
 secure = true
@@ -134,6 +142,3 @@ scopes = "internal_application_mgt_delete"
 
 [tenant_context.rewrite]
 custom_webapps = ["/keymanager-operations/"]
-
-[config_data]
-path = "/_system/is_as_km/config"

docker-compose/apim-is-as-km-with-analytics/docker-compose.yml

@@ -37,7 +37,7 @@ services:
   is-as-km:
     build: ./dockerfiles/is-as-km
     healthcheck:
-      test: ["CMD", "nc", "-z","localhost", "9443"]
+      test: ["CMD", "nc", "-z","localhost", "9444"]
       interval: 10s
       start_period: 180s
       retries: 20
@@ -47,7 +47,7 @@ services:
     volumes:
       - ./conf/is-as-km:/home/wso2carbon/wso2-config-volume
     ports:
-      - "9444:9443"
+      - "9444:9444"
   api-manager:
     build: ./dockerfiles/apim
     healthcheck: