From 4c403161704e99edf217d91b462355c46ba3aa8d Mon Sep 17 00:00:00 2001
From: jeffkause <123761330+jeffkause@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:16:02 -0500
Subject: [PATCH 1/2] Reduce watermark opacity

Moving the watermark information from the file header to the Table of Contents, reduces the opacity of the watermark from 100% to 10%. Followed the changes from https://github.com/cisagov/trustymail_reporter/issues/54.
---
 src/report/https_scan_report.mustache | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/report/https_scan_report.mustache b/src/report/https_scan_report.mustache
index 024a625..fd2f3f9 100644
--- a/src/report/https_scan_report.mustache
+++ b/src/report/https_scan_report.mustache
@@ -93,13 +93,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% DHS Image Watermark
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[pages=some]{background}
-\backgroundsetup{
-contents={\includegraphics{assets/dhs-logo}},
-angle=0,
-scale=3.0,
-opacity=0.04
-}
+\usepackage{background}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% URL and Link Setup
@@ -343,6 +337,18 @@ opacity=0.04
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Table of Contents
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% DHS Image Watermark
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The watermarks are known to be acting a little wonky.  I created
+% cisagov/trustymail_reporter#54 to document this.
+\backgroundsetup{
+  pages=some,
+  contents=\includegraphics{assets/dhs-logo},
+  angle=0,
+  scale=3.0,
+  opacity=0.04,
+}
 \BgThispage
 %\large
 \tableofcontents

From ed903e42faff7bac9c4c915852bccc9edb07b575 Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@gwe.cisa.dhs.gov>
Date: Fri, 17 Nov 2023 15:23:43 -0500
Subject: [PATCH 2/2] Bump version from 1.2.13 to 1.2.14

---
 README.md       | 16 ++++++++--------
 src/version.txt |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1f4c9aa..190f04c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ expects the secrets in a different location.
 To run the `cisagov/pshtt_reporter` image via Docker:
 
 ```console
-docker run cisagov/pshtt_reporter:1.2.13
+docker run cisagov/pshtt_reporter:1.2.14
 ```
 
 ### Running with Docker Compose ###
@@ -43,7 +43,7 @@ docker run cisagov/pshtt_reporter:1.2.13
 
     services:
       pshtt_reporter:
-        image: cisagov/pshtt_reporter:1.2.13
+        image: cisagov/pshtt_reporter:1.2.14
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -89,7 +89,7 @@ environment variables.  See the
 
     services:
       pshtt_reporter:
-        image: cisagov/pshtt_reporter:1.2.13
+        image: cisagov/pshtt_reporter:1.2.14
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -126,7 +126,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/pshtt_reporter:1.2.13
+    docker pull cisagov/pshtt_reporter:1.2.14
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -136,11 +136,11 @@ environment variables.  See the
 The images of this container are tagged with [semantic
 versions](https://semver.org) of the underlying example project that they
 containerize.  It is recommended that most users use a version tag (e.g.
-`:1.2.13`).
+`:1.2.14`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/pshtt_reporter:1.2.13`| An exact release version. |
+|`cisagov/pshtt_reporter:1.2.14`| An exact release version. |
 |`cisagov/pshtt_reporter:1.2`| The most recent release matching the major and minor version numbers. |
 |`cisagov/pshtt_reporter:1`| The most recent release matching the major version number. |
 |`cisagov/pshtt_reporter:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -204,7 +204,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/pshtt_reporter:1.2.13 \
+  --tag cisagov/pshtt_reporter:1.2.14 \
   https://github.com/cisagov/pshtt_reporter.git#develop
 ```
 
@@ -235,7 +235,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/pshtt_reporter:1.2.13 .
+      --tag cisagov/pshtt_reporter:1.2.14 .
     ```
 
 ## Contributing ##
diff --git a/src/version.txt b/src/version.txt
index e6bfb46..530b385 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1 +1 @@
-__version__ = "1.2.13"
+__version__ = "1.2.14"