diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..e18365b30 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "images/proxy/nginx-lua-prometheus"] + path = images/proxy/nginx-lua-prometheus + url = https://github.com/knyar/nginx-lua-prometheus.git diff --git a/ansible/api-manager.yml b/ansible/api-manager.yml index 8413d2495..ef78b4bb4 100644 --- a/ansible/api-manager.yml +++ b/ansible/api-manager.yml @@ -1,6 +1,8 @@ --- - name: Kong API become: yes + vars_files: + - "{{inventory_dir}}/secrets.yml" hosts: "{{groups['swarm-manager-1'][0]}}" roles: - {role: kong-api, tags: ['kong-api']} diff --git a/ansible/artifacts-download.yml b/ansible/artifacts-download.yml index a58a6f62d..feb78219b 100644 --- a/ansible/artifacts-download.yml +++ b/ansible/artifacts-download.yml @@ -4,7 +4,7 @@ vars_files: - "{{inventory_dir}}/secrets.yml" environment: - AZURE_STORAGE_ACCOUNT: "{{ artifact_azure_account_name }}" - AZURE_STORAGE_KEY: "{{ artifact_azure_account_key }}" + AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}" + AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}" roles: - artifacts-download-azure diff --git a/ansible/artifacts-upload.yml b/ansible/artifacts-upload.yml index 4071e5132..772ec2cca 100644 --- a/ansible/artifacts-upload.yml +++ b/ansible/artifacts-upload.yml @@ -4,7 +4,7 @@ vars_files: - "{{inventory_dir}}/secrets.yml" environment: - AZURE_STORAGE_ACCOUNT: "{{ artifact_azure_account_name }}" - AZURE_STORAGE_KEY: "{{ artifact_azure_account_key }}" + AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}" + AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}" roles: - artifacts-upload-azure diff --git a/ansible/artifacts/sunbird/login/info.ftl b/ansible/artifacts/sunbird/login/info.ftl index f151cfde5..d52d7af69 100755 --- a/ansible/artifacts/sunbird/login/info.ftl +++ b/ansible/artifacts/sunbird/login/info.ftl @@ -3,23 +3,17 @@ <#if section = "title"> ${message.summary} <#elseif section = "form"> -
${message.summary}
<#if skipLink??> <#else> - <#if pageRedirectUri??> - - <#elseif client.baseUrl??> - - #if> + #if>- ${msg("pageExpiredMsg1")} ${msg("doClickHere")}. - ${msg("pageExpiredMsg2")} ${msg("doClickHere")}. -
+${msg("pageExpiredMsg1")}
+ ${msg("doClickHere")}
+ ${msg("pageExpiredMsg2")}
+ ${msg("doClickHere")}
+
Login
${msg("mergeAccountMessage")}
${msg("migrateAccountMessage")}
-