mirror of
https://repository.entgra.net/community/product-iots.git
synced 2025-09-16 23:32:19 +00:00
Merge pull request #1582 from rasika/master
Adding androidAgentDownloadURL for the change-ip script
This commit is contained in:
Charitha Goonetilleke
GitHub
commit
12e64ca90c
@ -371,19 +371,6 @@
|
||||
</excludes>
|
||||
</fileSet>
|
||||
|
||||
<!-- Copying android-web-agent-->
|
||||
<fileSet>
|
||||
<directory>
|
||||
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/android-web-agent/
|
||||
</directory>
|
||||
<outputDirectory>
|
||||
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent
|
||||
</outputDirectory>
|
||||
<excludes>
|
||||
<exclude>**/jaggery.conf</exclude>
|
||||
</excludes>
|
||||
</fileSet>
|
||||
|
||||
<fileSet>
|
||||
<directory>
|
||||
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps/
|
||||
@ -1503,14 +1490,6 @@
|
||||
<filtered>true</filtered>
|
||||
<fileMode>644</fileMode>
|
||||
</file>
|
||||
|
||||
<file>
|
||||
<source>src/core/jaggeryapps/android-web-agent/jaggery.conf</source>
|
||||
<outputDirectory>
|
||||
${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/android-web-agent/
|
||||
</outputDirectory>
|
||||
<fileMode>755</fileMode>
|
||||
</file>
|
||||
<file>
|
||||
<source>src/core/jaggeryapps/api-store/jaggery.conf</source>
|
||||
<outputDirectory>
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
{
|
||||
"displayName": "UUF Template App",
|
||||
"logLevel": "warn",
|
||||
"urlMappings": [
|
||||
{
|
||||
"url": "/uuf/login",
|
||||
"path": "/lib/modules/auth/login.jag"
|
||||
},
|
||||
{
|
||||
"url": "/uuf/logout",
|
||||
"path": "/lib/modules/auth/logout.jag"
|
||||
},
|
||||
{
|
||||
"url": "/uuf/sso/acs",
|
||||
"path": "/lib/modules/auth/acs.jag"
|
||||
},
|
||||
{
|
||||
"url": "/public/*",
|
||||
"path": "/lib/static-files.jag"
|
||||
},
|
||||
{
|
||||
"url": "/unit/*",
|
||||
"path": "/lib/units.jag"
|
||||
},
|
||||
{
|
||||
"url": "/*",
|
||||
"path": "/lib/pages.jag"
|
||||
}
|
||||
],
|
||||
"filters": [
|
||||
{
|
||||
"name": "ContentTypeBasedCachePreventionFilter",
|
||||
"class": "org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter",
|
||||
"params" : [
|
||||
{"name" : "patterns", "value" : "text/html\" ,application/json\" ,text/plain"},
|
||||
{"name" : "filterAction", "value" : "enforce"},
|
||||
{"name" : "httpHeaders", "value" : "Cache-Control: no-store, no-cache, must-revalidate, private"}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name":"HttpHeaderSecurityFilter",
|
||||
"class":"org.apache.catalina.filters.HttpHeaderSecurityFilter",
|
||||
"params" : [{"name" : "hstsEnabled", "value" : "false"}]
|
||||
}
|
||||
|
||||
],
|
||||
"filterMappings": [
|
||||
{
|
||||
"name":"HttpHeaderSecurityFilter",
|
||||
"url":"*"
|
||||
},
|
||||
{
|
||||
"name":"ContentTypeBasedCachePreventionFilter",
|
||||
"url":"*"
|
||||
}
|
||||
|
||||
]
|
||||
}
|
||||
@ -62,6 +62,11 @@ sed -i -e 's/"identityProvider.*/\"identityProviderUrl\"\ :\ "https\:\/\/'$val2'
|
||||
sed -i -e 's/"acs.*/\"acs\"\ :\ "https\:\/\/'$val2':9443\/devicemgt\/uuf\/sso\/acs\"\,/' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/app-conf.json
|
||||
echo "Completed!!"
|
||||
|
||||
#--------------------
|
||||
echo "Changing <IoT_HOME>/repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json"
|
||||
sed -i -e 's/"androidAgentDownloadURL.*/\"androidAgentDownloadURL\":\ "https\:\/\/\%iot.manager.host\%\:\%iot.manager.https.port\%\/devicemgt\/public\/cdmf.unit.device.type.android.type-view\/assets\/android-agent.apk\",/' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json
|
||||
echo "Completed!!"
|
||||
|
||||
#--------------------
|
||||
echo "Changing <IoT_HOME>/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json"
|
||||
sed -i -e 's/"identityProvider.*/\"identityProviderURL\"\ :\ "https\:\/\/'$val2':9443\/samlsso\"\,/' ../repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
|
||||
|
||||
@ -129,9 +129,6 @@ if [ $val5 = "Y" ]; then
|
||||
sed -i -e 's#\("owner": "\)'$val1'\(@carbon.super"\)#\1'$val3'\2#g' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json
|
||||
echo "Completed!!"
|
||||
|
||||
echo "Changing <IoT_HOME>/repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json"
|
||||
sed -i -e 's#\("owner": "\)'$val1'\(@carbon.super"\)#\1'$val3'\2#g' ../repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json
|
||||
echo "Completed!!"
|
||||
else if [ $val5 = "N" ]; then
|
||||
echo ""
|
||||
echo "Please enter the old tenant domain of the IoTS "
|
||||
@ -153,10 +150,6 @@ else if [ $val5 = "N" ]; then
|
||||
sed -i -e 's#\("adminUser": "\)'$val1'\(@\)'$val6'\("\)#\1'$val3'\2'$val7'\3#g' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json
|
||||
sed -i -e 's#\("owner": "\)'$val1'\(@\)'$val6'\("\)#\1'$val3'\2'$val7'\3#g' ../repository/deployment/server/jaggeryapps/devicemgt/app/conf/config.json
|
||||
echo "Completed!!"
|
||||
|
||||
echo "Changing <IoT_HOME>/repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json"
|
||||
sed -i -e 's#\("owner": "\)'$val1'\(@\)'$val6'\("\)#\1'$val3'\2'$val7'\3#g' ../repository/deployment/server/jaggeryapps/android-web-agent/app/conf/config.json
|
||||
echo "Completed!!"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
4
pom.xml
4
pom.xml
@ -1517,14 +1517,14 @@
|
||||
<carbon.governance.version>4.7.8</carbon.governance.version>
|
||||
|
||||
<!-- Carbon Device Management-->
|
||||
<carbon.device.mgt.version>3.0.189</carbon.device.mgt.version>
|
||||
<carbon.device.mgt.version>3.0.196</carbon.device.mgt.version>
|
||||
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
|
||||
|
||||
<!-- IOT Device Management -->
|
||||
<product.iot.version>${project.version}</product.iot.version>
|
||||
|
||||
<!-- Carbon Device Management Plugins-->
|
||||
<carbon.device.mgt.plugin.version>4.0.105</carbon.device.mgt.plugin.version>
|
||||
<carbon.device.mgt.plugin.version>4.0.108</carbon.device.mgt.plugin.version>
|
||||
|
||||
<!-- API Management -->
|
||||
<carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user