- <#if message?has_content>
-
- ${message.summary}
+
+
+
+
+
+
+
+ ${msg("enterCode")}
+
+
+ <#if message?has_content>
+
+ ${message.summary}
+
+ #if>
+
+
+ <#if client?? && client.baseUrl?has_content>
+
+ #if>
- #if>
-
- <#if client?? && client.baseUrl?has_content>
-
- #if>
+
-
#if>
diff --git a/ansible/artifacts/sunbird/login/template.ftl b/ansible/artifacts/sunbird/login/template.ftl
index 597358b24b..861559e4b0 100644
--- a/ansible/artifacts/sunbird/login/template.ftl
+++ b/ansible/artifacts/sunbird/login/template.ftl
@@ -1,7 +1,6 @@
<#macro registrationLayout bodyClass="" displayInfo=false displayMessage=true>
-
-
+
@@ -9,9 +8,11 @@
+
-
+
+
<#if properties.meta?has_content>
<#list properties.meta?split(' ') as meta>
@@ -38,8 +39,7 @@
-
-
+
@@ -88,21 +88,15 @@
if(sessionTenant){
var imgSrc = "${url.resourcesPath}/img/tenants/"+sessionTenant+".png";
}else{
- var imgSrc = "${url.resourcesPath}/img/logo.png";
+ var imgSrc = "${url.resourcesPath}/img/iGOT_Karmayogi_logo.jpg";
}
var logoImg = document.querySelector(".ui.header img");
if(logoImg){
logoImg.setAttribute('class','logo-image');
- if(sessionTenant) {
- var logoname = sessionTenant + 'logo';
- logoImg.setAttribute('alt',logoname);
- } else {
- var logoname = 'Sunbird logo';
- logoImg.setAttribute('alt',logoname);
- }
+ logoImg.setAttribute('alt',sessionTenant);
logoImg.src = imgSrc;
- logoImg.addEventListener("error", ()=>{ logoImg.onerror=null;logoImg.src='${url.resourcesPath}/img/logo.png'});
+ logoImg.addEventListener("error", ()=>{ logoImg.onerror=null;logoImg.src='${url.resourcesPath}/img/iGOT_Karmayogi_logo.jpg'});
}
@@ -117,7 +111,6 @@
-
#macro>
diff --git a/ansible/artifacts/sunbird/login/theme.properties b/ansible/artifacts/sunbird/login/theme.properties
index 153e0d1014..46e4112e80 100644
--- a/ansible/artifacts/sunbird/login/theme.properties
+++ b/ansible/artifacts/sunbird/login/theme.properties
@@ -13,9 +13,9 @@
# 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.
-# scripts=js/login.js?v=1.15.b
+#
parent=base
-styles=css/semantic.min.css?v=1.15.b css/login.css?v=1.15.b
-scripts=js/jquery-3.3.1.min.js?v=1.15.b js/telemetry_service.js?v=1.15.b
+styles=css/semantic.min.css?v=1.18.b css/login.css?v=1.24.b
+scripts=js/login.js?v=1.22.b
kcFeedbackAreaClass=ui info message
diff --git a/ansible/roles/keycloak-deploy/tasks/deploy.yml b/ansible/roles/keycloak-deploy/tasks/deploy.yml
index fde6de9c08..f7534d1422 100644
--- a/ansible/roles/keycloak-deploy/tasks/deploy.yml
+++ b/ansible/roles/keycloak-deploy/tasks/deploy.yml
@@ -18,6 +18,9 @@
regexp: "{{ item.var }}.*"
with_items:
- {var: 'sunbird_user_service_base_url', value: '{{ sunbird_user_service_base_url }}'}
+ - {var: 'sunbird_authorization', value: '{{ core_vault_sunbird_ekstep_api_key }}'}
+ - {var: 'sunbird_lms_base_url', value: 'https://{{ static_domain_name }}/api'}
+ - {var: 'sunbird_login_otp_template', value: 'loginWithOTP'}
- name: Remove old ENV Vars from environemt file
lineinfile:
@@ -26,8 +29,6 @@
regexp: "{{ item.var }}.*"
state: absent
with_items:
- - {var: 'sunbird_lms_base_url'}
- - {var: 'sunbird_authorization'}
- {var: 'sunbird_encryption_key'}
- {var: 'sunbird_sso_username'}
- {var: 'sunbird_sso_password'}
@@ -137,6 +138,15 @@
when: "{{ msg_91_required|default(false) }}"
ignore_errors: true
+- name: NIC SMS provider configuration file
+ template:
+ src: "roles/keycloak-deploy/templates/NicSmsCreds.json.j2"
+ dest: "sunbird_auth_{{ sunbird_auth_version }}.config/NicSmsCreds.json"
+ mode: 0755
+ when: "{{ msg_91_required|default(false) }}"
+ ignore_errors: true
+
+
- name: Keycloak configuration XML file
copy:
src: "sunbird_auth_{{ sunbird_auth_version }}.config/standalone-ha.xml"
@@ -182,6 +192,19 @@
when: "{{ msg_91_required|default(false) }}"
ignore_errors: true
+
+- name: NIC SMS provider configuration file
+ copy:
+ src: "sunbird_auth_{{ sunbird_auth_version }}.config/NicSmsCreds.json"
+ dest: "{{ keycloak_home }}/bin/sms-provider/NicSmsCreds.json"
+ owner: "{{ wildfly_user }}"
+ group: "{{ wildfly_group }}"
+ mode: 0755
+ remote_src: true
+ when: "{{ msg_91_required|default(false) }}"
+ ignore_errors: true
+
+
- name: Remove the sunbird_auth_{{ sunbird_auth_version }}.config
become: true
file:
@@ -196,6 +219,13 @@
insertafter: '^SERVER_OPTS=""'
line: 'JAVA_HOME=""'
path: "{{ keycloak_home }}/bin/standalone.sh"
+
+- name: Add trustStore Path
+ become: true
+ lineinfile:
+ path: "{{ keycloak_home }}/bin/standalone.sh"
+ insertafter: "DEFAULT_MODULAR_JVM_OPTIONS"
+ line: ' JAVA_OPTS="-Djavax.net.ssl.trustStore=/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/security/cacerts -Djavax.net.ssl.trustStorePassword=changeit $JAVA_OPTS"'
- name: start keycloak service
debug: msg="starting keycloak"
diff --git a/ansible/roles/keycloak-deploy/templates/NicSmsCreds.json.j2 b/ansible/roles/keycloak-deploy/templates/NicSmsCreds.json.j2
new file mode 100644
index 0000000000..d4d7b501f8
--- /dev/null
+++ b/ansible/roles/keycloak-deploy/templates/NicSmsCreds.json.j2
@@ -0,0 +1,23 @@
+{
+ "gatewayUrl": "{{ smsgatewayurl }}",
+ "signature": "{{ smssign }}",
+ "country": "{{ smscountrycode }}",
+ "messageTypes": [
+ {
+ "username": "{{ smsusername }}",
+ "password": "{{ smspassword }}",
+ "name":"{{ smsname }}",
+ "message": "{{ smsmessage }}",
+ "dlt_entity_id": "{{ smsentityid }}",
+ "dlt_template_id": "{{ smstemplateid }}"
+ },
+ {
+ "username": "{{ smsotpusername }}",
+ "password": "{{ smsotppassword }}",
+ "name": "{{ smsotpname }}",
+ "message": "{{ smsotpmessage }}",
+ "dlt_entity_id": "{{ smsotpentityid }}",
+ "dlt_template_id": "{{ smsotptemplateid }}"
+ }
+ ]
+}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env b/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
index 6a13ddadfd..fa09a8b413 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_knowledge-mw-service.env
@@ -58,3 +58,5 @@ sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
sunbird_health_check_enable={{sunbird_health_check_enable}}
# Release-3.0.0
sunbird_keycloak_public_key={{core_vault_sunbird_sso_publickey}}
+
+sunbird_content_upload_data_limit=400mb