From a5e1645b80ed7a47963663628565d457c645b21f Mon Sep 17 00:00:00 2001
From: Glenn Morris <gmorris@slac.stanford.edu>
Date: Mon, 1 Apr 2024 17:08:48 -0700
Subject: [PATCH 1/4] (role/ccs-mcm) add another CCS tomcat war file

---
 hieradata/role/ccs-mcm.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hieradata/role/ccs-mcm.yaml b/hieradata/role/ccs-mcm.yaml
index 3dd7d168b5..2742d9e936 100644
--- a/hieradata/role/ccs-mcm.yaml
+++ b/hieradata/role/ccs-mcm.yaml
@@ -17,6 +17,9 @@ nginx::gzip_proxied: "any"
 profile::ccs::tomcat::wars:
   CCSWebTrending.war:
     war_source: "https://repo-nexus.lsst.org/nexus/repository/ccs-maven2-public/org/lsst/CCSWebTrending/2.1/CCSWebTrending-2.1.war"
+  CCSImageUtilities.war:
+    war_source: "https://repo-nexus.lsst.org/nexus/repository/ccs-maven2-public/org/lsst/org-lsst-ccs-image-utilities-war/3.1.18/org-lsst-ccs-image-utilities-war-3.1.18.war"
+
 profile::core::systemd::tmpfile:
   docker_tmp.conf:  # XXX short term kludge
     content: "x /tmp/docker_tmp 0777 saluser saluser -"

From 8f17def243b7a211d8048aed7bde74d0cef67ff0 Mon Sep 17 00:00:00 2001
From: Glenn Morris <gmorris@slac.stanford.edu>
Date: Tue, 2 Apr 2024 11:43:31 -0700
Subject: [PATCH 2/4] (site/profile/manifests/ccs/tomcat) add option to install
 jar files

---
 site/profile/manifests/ccs/tomcat.pp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/site/profile/manifests/ccs/tomcat.pp b/site/profile/manifests/ccs/tomcat.pp
index ae4ffeb631..73703c5a12 100644
--- a/site/profile/manifests/ccs/tomcat.pp
+++ b/site/profile/manifests/ccs/tomcat.pp
@@ -4,8 +4,12 @@
 # @param wars
 #   `tomcat::wars` resources to create.
 #
+# @param jars
+#   Hash of jar files to install in lib directory: basename, source.
+#
 class profile::ccs::tomcat (
   Hash[String, Hash] $wars = {},
+  Hash[String[1],String[1]] $jars = {},
 ) {
   include nginx
 
@@ -13,6 +17,7 @@
   $root_path     = '/opt/tomcat'
   $catalina_home = "${root_path}/apache-tomcat-${version}"
   $catalina_base = "${root_path}/catalina_base"
+  $catalina_lib  = "${catalina_base}/lib"
 
   file { $root_path:
     ensure => directory,
@@ -80,6 +85,17 @@
     }
   }
 
+  $jars.each |String $jfile, String $jsrc| {
+    file { "${catalina_lib}/${jfile}":
+      ensure  => file,
+      owner   => 'tomcat',
+      group   => 'tomcat',
+      mode    => '0664',
+      source  => $jsrc,
+      require => Exec['wait for tomcat'],
+    }
+  }
+
   $service_unit = @("EOT")
     [Unit]
     Description=Tomcat 9 servlet container

From e27640cf638086ba6ef2fd160cf2bba89d4a0b03 Mon Sep 17 00:00:00 2001
From: Glenn Morris <gmorris@slac.stanford.edu>
Date: Tue, 2 Apr 2024 11:44:33 -0700
Subject: [PATCH 3/4] (role/ccs-mcm) add tomcat jar files

---
 hieradata/role/ccs-mcm.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hieradata/role/ccs-mcm.yaml b/hieradata/role/ccs-mcm.yaml
index 2742d9e936..1d118e9c83 100644
--- a/hieradata/role/ccs-mcm.yaml
+++ b/hieradata/role/ccs-mcm.yaml
@@ -14,6 +14,9 @@ nginx::ssl_protocols: "TLSv1.2"
 nginx::ssl_ciphers: |
   ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256
 nginx::gzip_proxied: "any"
+profile::ccs::tomcat::jars:
+  "mysql-connector-java-5.1.23.jar": "https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.23/mysql-connector-java-5.1.23.jar"
+  "h2-1.4.191.jar": "https://repo1.maven.org/maven2/com/h2database/h2/1.4.191/h2-1.4.191.jar"
 profile::ccs::tomcat::wars:
   CCSWebTrending.war:
     war_source: "https://repo-nexus.lsst.org/nexus/repository/ccs-maven2-public/org/lsst/CCSWebTrending/2.1/CCSWebTrending-2.1.war"

From d2df52621a4d01faea2238b3d6bcc39694e72d17 Mon Sep 17 00:00:00 2001
From: Glenn Morris <gmorris@slac.stanford.edu>
Date: Tue, 2 Apr 2024 15:19:14 -0700
Subject: [PATCH 4/4] (role/ccs-mcm) update CCSWebTrending.war version

---
 hieradata/role/ccs-mcm.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hieradata/role/ccs-mcm.yaml b/hieradata/role/ccs-mcm.yaml
index 1d118e9c83..40ce3c12c9 100644
--- a/hieradata/role/ccs-mcm.yaml
+++ b/hieradata/role/ccs-mcm.yaml
@@ -19,7 +19,7 @@ profile::ccs::tomcat::jars:
   "h2-1.4.191.jar": "https://repo1.maven.org/maven2/com/h2database/h2/1.4.191/h2-1.4.191.jar"
 profile::ccs::tomcat::wars:
   CCSWebTrending.war:
-    war_source: "https://repo-nexus.lsst.org/nexus/repository/ccs-maven2-public/org/lsst/CCSWebTrending/2.1/CCSWebTrending-2.1.war"
+    war_source: "https://repo-nexus.lsst.org/nexus/repository/ccs-maven2-public/org/lsst/CCSWebTrending/2.2/CCSWebTrending-2.2.war"
   CCSImageUtilities.war:
     war_source: "https://repo-nexus.lsst.org/nexus/repository/ccs-maven2-public/org/lsst/org-lsst-ccs-image-utilities-war/3.1.18/org-lsst-ccs-image-utilities-war-3.1.18.war"