From ce24a1ed4181b5e195cdecdc16fe9ad4548db17b Mon Sep 17 00:00:00 2001
From: W <willg258@hotmail.co.uk>
Date: Wed, 24 Apr 2024 11:46:23 +0100
Subject: [PATCH] ..

---
 ansible/group_vars/server_type_oasys_web.yml  |   1 +
 ansible/roles/oasys-ords/defaults/main.yml    |  10 ++++++---
 ansible/roles/oasys-ords/tasks/files.yml      |   2 +-
 .../oasys-ords/templates/doc_root/favicon.ico | Bin 0 -> 15406 bytes
 .../templates/doc_root/index_message.html.j2  |  19 ++++++++++++++----
 .../doc_root/index_no_message.html.j2         |  19 ++++++++++++++----
 .../doc_root/preproduction-index.html.j2      |  19 ++++++++++++++----
 .../doc_root/production-index.html.j2         |  19 ++++++++++++++----
 .../templates/doc_root/t1-index.html.j2       |  19 ++++++++++++++----
 .../templates/doc_root/t2-index.html.j2       |  19 ++++++++++++++----
 10 files changed, 99 insertions(+), 28 deletions(-)
 create mode 100644 ansible/roles/oasys-ords/templates/doc_root/favicon.ico

diff --git a/ansible/group_vars/server_type_oasys_web.yml b/ansible/group_vars/server_type_oasys_web.yml
index 36f6bcb0d..e15728d39 100644
--- a/ansible/group_vars/server_type_oasys_web.yml
+++ b/ansible/group_vars/server_type_oasys_web.yml
@@ -34,6 +34,7 @@ packages_yum_install:
   - zip
   - git
   - net-tools
+  - jq
 
 packages_yum_update: []
 
diff --git a/ansible/roles/oasys-ords/defaults/main.yml b/ansible/roles/oasys-ords/defaults/main.yml
index 3520481c1..c08fe3fc8 100644
--- a/ansible/roles/oasys-ords/defaults/main.yml
+++ b/ansible/roles/oasys-ords/defaults/main.yml
@@ -7,9 +7,10 @@ oasys_links_default_path: "/eor/f?p=100:101"
 oasys_index_page: "{{ ec2.tags['oasys-environment'] }}-index.html"
 oasys_ords_docroot_dir: "{{ oasys_ords_root_dir }}/webapps/ROOT"
 oasys_ords_extra_files:
-  - "redirect.html"
-  - "index_message.html"
-  - "index_no_message.html"
+  - "redirect.html.j2"
+  - "index_message.html.j2"
+  - "index_no_message.html.j2"
+  - "favicon.ico"
 oasys_ords_s3_bucket: "hmpps/oasys-ords"
 oasys_maintenance_msg: ""
 ords_db_port: 1521
@@ -32,3 +33,6 @@ secret_db_prefix: /oracle/database
 oasys_ords_maintenance_msg_secret: "/ec2/{{ ec2.tags.Name }}/maintenance_message"
 oasys_ords_get_maintenance_msg_command: "aws secretsmanager get-secret-value --secret-id {{ oasys_ords_maintenance_msg_secret }} --query SecretString --output text"
 oasys_ords_maintenance_message_file: "{{ oasys_ords_docroot_dir }}/maintenance_message.html"
+
+
+aws secretsmanager get-secret-value --secret-id /ec2/t2-oasys-web-b/maintenance_message --query SecretString --output text | jq .message | xargs
diff --git a/ansible/roles/oasys-ords/tasks/files.yml b/ansible/roles/oasys-ords/tasks/files.yml
index a496037a4..784a23324 100644
--- a/ansible/roles/oasys-ords/tasks/files.yml
+++ b/ansible/roles/oasys-ords/tasks/files.yml
@@ -40,7 +40,7 @@
 
 - name: Copy any additional docroot files
   ansible.builtin.template:
-    src: "doc_root/{{ item }}.j2"
+    src: "doc_root/{{ item }}"
     dest: "{{ oasys_ords_docroot_dir }}/{{ item }}"
     owner: "{{ ords_install_user }}"
     group: "{{ ords_install_group }}"
diff --git a/ansible/roles/oasys-ords/templates/doc_root/favicon.ico b/ansible/roles/oasys-ords/templates/doc_root/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7b16c60e2cce36ad0cdccf4ec56a88ba018f2d05
GIT binary patch
literal 15406
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
DU1~Y~

literal 0
HcmV?d00001

diff --git a/ansible/roles/oasys-ords/templates/doc_root/index_message.html.j2 b/ansible/roles/oasys-ords/templates/doc_root/index_message.html.j2
index cb0f88939..8b11cec99 100644
--- a/ansible/roles/oasys-ords/templates/doc_root/index_message.html.j2
+++ b/ansible/roles/oasys-ords/templates/doc_root/index_message.html.j2
@@ -108,12 +108,23 @@ jQuery.fn.pngFix = function(settings) {
 jQuery.fn.maintenanceMessage = function() {
   
 	jQuery.get('maintenance_message.html', function(message) {
-		console.log(message);
-		$('textarea[name="Comments"]').val(message)
+		var messageJs = JSON.parse(message)
+		var messageText = messageJs.message;
+		var messageShow = messageJs.show;
+
+		$('textarea[name="Comments"]').val(messageText);
 		
-		// hide row if no message
-		if(!message) {
+		// hide row if show is false
+		if (messageShow === true) {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow === false) {
+			$("#maintenanceMessageBox").hide();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "true") {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "false") {
 			$("#maintenanceMessageBox").hide();
+		} else {
+			$("#maintenanceMessageBox").show();
 		}
 
 	}, 'text');
diff --git a/ansible/roles/oasys-ords/templates/doc_root/index_no_message.html.j2 b/ansible/roles/oasys-ords/templates/doc_root/index_no_message.html.j2
index 0d3af6cf0..17c5aa481 100644
--- a/ansible/roles/oasys-ords/templates/doc_root/index_no_message.html.j2
+++ b/ansible/roles/oasys-ords/templates/doc_root/index_no_message.html.j2
@@ -108,12 +108,23 @@ jQuery.fn.pngFix = function(settings) {
 jQuery.fn.maintenanceMessage = function() {
   
 	jQuery.get('maintenance_message.html', function(message) {
-		console.log(message);
-		$('textarea[name="Comments"]').val(message)
+		var messageJs = JSON.parse(message)
+		var messageText = messageJs.message;
+		var messageShow = messageJs.show;
+
+		$('textarea[name="Comments"]').val(messageText);
 		
-		// hide row if no message
-		if(!message) {
+		// hide row if show is false
+		if (messageShow === true) {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow === false) {
+			$("#maintenanceMessageBox").hide();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "true") {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "false") {
 			$("#maintenanceMessageBox").hide();
+		} else {
+			$("#maintenanceMessageBox").show();
 		}
 
 	}, 'text');
diff --git a/ansible/roles/oasys-ords/templates/doc_root/preproduction-index.html.j2 b/ansible/roles/oasys-ords/templates/doc_root/preproduction-index.html.j2
index 99acc70d2..6a4853d51 100644
--- a/ansible/roles/oasys-ords/templates/doc_root/preproduction-index.html.j2
+++ b/ansible/roles/oasys-ords/templates/doc_root/preproduction-index.html.j2
@@ -108,12 +108,23 @@ jQuery.fn.pngFix = function(settings) {
 jQuery.fn.maintenanceMessage = function() {
   
 	jQuery.get('maintenance_message.html', function(message) {
-		console.log(message);
-		$('textarea[name="Comments"]').val(message)
+		var messageJs = JSON.parse(message)
+		var messageText = messageJs.message;
+		var messageShow = messageJs.show;
+
+		$('textarea[name="Comments"]').val(messageText);
 		
-		// hide row if no message
-		if(!message) {
+		// hide row if show is false
+		if (messageShow === true) {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow === false) {
+			$("#maintenanceMessageBox").hide();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "true") {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "false") {
 			$("#maintenanceMessageBox").hide();
+		} else {
+			$("#maintenanceMessageBox").show();
 		}
 
 	}, 'text');
diff --git a/ansible/roles/oasys-ords/templates/doc_root/production-index.html.j2 b/ansible/roles/oasys-ords/templates/doc_root/production-index.html.j2
index 72a053ff8..34646eec8 100644
--- a/ansible/roles/oasys-ords/templates/doc_root/production-index.html.j2
+++ b/ansible/roles/oasys-ords/templates/doc_root/production-index.html.j2
@@ -108,12 +108,23 @@ jQuery.fn.pngFix = function(settings) {
 jQuery.fn.maintenanceMessage = function() {
   
 	jQuery.get('maintenance_message.html', function(message) {
-		console.log(message);
-		$('textarea[name="Comments"]').val(message)
+		var messageJs = JSON.parse(message)
+		var messageText = messageJs.message;
+		var messageShow = messageJs.show;
+
+		$('textarea[name="Comments"]').val(messageText);
 		
-		// hide row if no message
-		if(!message) {
+		// hide row if show is false
+		if (messageShow === true) {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow === false) {
+			$("#maintenanceMessageBox").hide();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "true") {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "false") {
 			$("#maintenanceMessageBox").hide();
+		} else {
+			$("#maintenanceMessageBox").show();
 		}
 
 	}, 'text');
diff --git a/ansible/roles/oasys-ords/templates/doc_root/t1-index.html.j2 b/ansible/roles/oasys-ords/templates/doc_root/t1-index.html.j2
index e026cf112..efdac926e 100644
--- a/ansible/roles/oasys-ords/templates/doc_root/t1-index.html.j2
+++ b/ansible/roles/oasys-ords/templates/doc_root/t1-index.html.j2
@@ -108,12 +108,23 @@ jQuery.fn.pngFix = function(settings) {
 jQuery.fn.maintenanceMessage = function() {
   
 	jQuery.get('maintenance_message.html', function(message) {
-		console.log(message);
-		$('textarea[name="Comments"]').val(message)
+		var messageJs = JSON.parse(message)
+		var messageText = messageJs.message;
+		var messageShow = messageJs.show;
+
+		$('textarea[name="Comments"]').val(messageText);
 		
-		// hide row if no message
-		if(!message) {
+		// hide row if show is false
+		if (messageShow === true) {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow === false) {
+			$("#maintenanceMessageBox").hide();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "true") {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "false") {
 			$("#maintenanceMessageBox").hide();
+		} else {
+			$("#maintenanceMessageBox").show();
 		}
 
 	}, 'text');
diff --git a/ansible/roles/oasys-ords/templates/doc_root/t2-index.html.j2 b/ansible/roles/oasys-ords/templates/doc_root/t2-index.html.j2
index a61508cd9..3da4226d3 100644
--- a/ansible/roles/oasys-ords/templates/doc_root/t2-index.html.j2
+++ b/ansible/roles/oasys-ords/templates/doc_root/t2-index.html.j2
@@ -108,12 +108,23 @@ jQuery.fn.pngFix = function(settings) {
 jQuery.fn.maintenanceMessage = function() {
   
 	jQuery.get('maintenance_message.html', function(message) {
-		console.log(message);
-		$('textarea[name="Comments"]').val(message)
+		var messageJs = JSON.parse(message)
+		var messageText = messageJs.message;
+		var messageShow = messageJs.show;
+
+		$('textarea[name="Comments"]').val(messageText);
 		
-		// hide row if no message
-		if(!message) {
+		// hide row if show is false
+		if (messageShow === true) {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow === false) {
+			$("#maintenanceMessageBox").hide();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "true") {
+			$("#maintenanceMessageBox").show();
+		} else if (messageShow.toLowerCase().replace(/\s/g,'') === "false") {
 			$("#maintenanceMessageBox").hide();
+		} else {
+			$("#maintenanceMessageBox").show();
 		}
 
 	}, 'text');