Merge release 4.5.0 vdn to 4.6.0 vdn (#3120)

* fix: adding log4j env property injection (#3070) * fix: add _JAVA_OPTIONS (#3073) * fix: add _JAVA_OPTIONS, cleanup of charts (#3074) * ansible updates to add log4j env to service file in vdn env (#3076) * Issue #SB-26446: Env vars for transcript (#3055) * Issue #SB-28194 fix: bulk upload name & description length added as a configuration (#3118) Co-authored-by: Akhil <[email protected]> Co-authored-by: Amol Ghatol <[email protected]> Co-authored-by: Kartheek Palla <[email protected]>
project-sunbird · Jan 3, 2022 · d2c8c2c · d2c8c2c
1 parent 3efa867
commit d2c8c2c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 1 deletion.
diff --git a/ansible/roles/cassandra/tasks/main.yml b/ansible/roles/cassandra/tasks/main.yml
@@ -60,6 +60,24 @@
   pause:
     seconds: 10
 
+- name: Make sure systemd destination dir exists
+  file:
+    path: "/etc/systemd/system/cassandra.service.d"
+    state: directory
+    mode: "755"
+
+- name: Copy specific cassandra Systemd config file
+  template:
+    src: "override.conf.j2"
+    dest: "/etc/systemd/system/cassandra.service.d/override.conf"
+    owner: root
+    group: cassandra
+    mode: "644"
+    force: yes
+
+- name: Force systemd to reread configs
+  systemd: daemon_reload=yes    
+
 - name: Restart Cassandra now
   service: 
     name: cassandra 

diff --git a/ansible/roles/cassandra/templates/override.conf.j2 b/ansible/roles/cassandra/templates/override.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
diff --git a/ansible/roles/elasticsearch/templates/systemd/elasticsearch.j2 b/ansible/roles/elasticsearch/templates/systemd/elasticsearch.j2
@@ -5,6 +5,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 Environment=ES_HOME={{es_home}}
 Environment=CONF_DIR={{conf_dir}}
 Environment=DATA_DIR={{ data_dirs | array_to_str }}

diff --git a/ansible/roles/es6/templates/systemd/elasticsearch.j2 b/ansible/roles/es6/templates/systemd/elasticsearch.j2
@@ -5,6 +5,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 Environment=ES_HOME={{es_home}}
 Environment=CONF_DIR={{conf_dir}}
 Environment=ES_PATH_CONF={{conf_dir}}

diff --git a/ansible/roles/keycloak-provision/templates/keycloak-service.j2 b/ansible/roles/keycloak-provision/templates/keycloak-service.j2
@@ -1,7 +1,7 @@
 #!/bin/bash
 keycloakuser=keycloak
 keycloakpath=/opt/keycloak/bin
-
+_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'
 # Normal output log
 LOGOUT=/var/log/keycloak.out.log
 # Error output log

diff --git a/ansible/roles/log-es6/templates/systemd/elasticsearch.j2 b/ansible/roles/log-es6/templates/systemd/elasticsearch.j2
@@ -5,6 +5,7 @@ Wants=network-online.target
 After=network-online.target
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 Environment=ES_HOME={{es_home}}
 Environment=CONF_DIR={{conf_dir}}
 Environment=ES_PATH_CONF={{conf_dir}}

diff --git a/ansible/roles/logstash/templates/logstash.service.j2 b/ansible/roles/logstash/templates/logstash.service.j2
@@ -2,6 +2,7 @@
 Description=logstash Daemon
 
 [Service]
+Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"
 Type=simple
 User={{learner_user}}
 Group={{learner_user}}

diff --git a/ansible/roles/stack-sunbird/templates/sunbird_player.env b/ansible/roles/stack-sunbird/templates/sunbird_player.env
@@ -148,6 +148,13 @@ dock_default_file_size={{ dock_default_file_size | default(150) }}
 dock_default_video_size={{ dock_default_video_size | default(15000) }}
 sunbird_kong_refresh_token_api=https://{{sunbird_domain_name}}/auth/v1/refresh/token
 use_sunbird_kong_token={{dock_use_sunbird_kong_token | default('true')}}
+sunbird_transcript_supported_languages={{sunbird_transcript_supported_languages | default('English, Hindi, Assamese, Bengali, Gujarati, Kannada, Malayalam, Marathi, Nepali, Odia, Punjabi, Tamil, Telugu, Urdu, Sanskrit, Maithili, Munda, Santali, Juang, Ho, Oriya')}}
+sunbird_transcript_file_format={{sunbird_transcript_file_format | default('srt')}}
+sunbird_transcript_required={{sunbird_transcript_required | default('false')}}
+
+#release-4.5.0
+sunbird_bulk_upload_name_length={{ sunbird_bulk_upload_name_length | default('50') }}
+sunbird_bulk_upload_description_length={{ sunbird_bulk_upload_description_length | default('500') }}
 
 #release-4.6.0
 sunbird_contextual_help_config={{ contextual_help_config }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[Service]
		Environment="_JAVA_OPTIONS='-Dlog4j2.formatMsgNoLookups=true'"