community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-change-supadmin' into 'master'

Browse Source 
Fix invalid config entries

See merge request entgra/carbon-device-mgt!880
This commit is contained in:
Pahansith Gunathilake 2022-04-25 03:54:16 +00:00
commit 2721588635
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2
View File

@ -64,7 +64,7 @@
{% else %} {% else %}
<ServerUrl>https://localhost:9443</ServerUrl> <ServerUrl>https://localhost:9443</ServerUrl>
<AdminUsername>${admin.username}</AdminUsername> <AdminUsername>${admin.username}</AdminUsername>
<AdminPassword>${admin.username}</AdminPassword> <AdminPassword>${admin.password}</AdminPassword>
{% endif %} {% endif %}
</IdentityConfiguration> </IdentityConfiguration>
<KeyManagerConfiguration> <KeyManagerConfiguration>
@ -75,7 +75,7 @@
{% else %} {% else %}
<ServerUrl>https://localhost:9443</ServerUrl> <ServerUrl>https://localhost:9443</ServerUrl>
<AdminUsername>${admin.username}</AdminUsername> <AdminUsername>${admin.username}</AdminUsername>
<AdminPassword>${admin.username}</AdminPassword> <AdminPassword>${admin.password}</AdminPassword>
{% endif %} {% endif %}
</KeyManagerConfiguration> </KeyManagerConfiguration>
<PolicyConfiguration> <PolicyConfiguration>

2
features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
View File

@ -95,7 +95,7 @@
<Parameter Name="IsRemote">false</Parameter> <Parameter Name="IsRemote">false</Parameter>
<Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter> <Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter>
<Parameter Name="Username">${admin.username}</Parameter> <Parameter Name="Username">${admin.username}</Parameter>
<Parameter Name="Password">${admin.username}</Parameter> <Parameter Name="Password">${admin.password}</Parameter>
<Parameter Name="MaxTotalConnections">100</Parameter> <Parameter Name="MaxTotalConnections">100</Parameter>
<Parameter Name="MaxConnectionsPerHost">100</Parameter> <Parameter Name="MaxConnectionsPerHost">100</Parameter>
</Parameters> </Parameters>