From b9c7129361db47da70b56ca589db36929939e891 Mon Sep 17 00:00:00 2001
From: jeffbanks <jeff.banks@datastax.com>
Date: Tue, 24 Aug 2021 15:33:20 -0500
Subject: [PATCH] Mount path change for config

Update config files loc /etc/reaper

shiro /etc path change adjustments
---
 .../docs/configuration/docker_vars/index.html |  2 +-
 .../content/docs/configuration/docker_vars.md |  2 +-
 src/server/src/main/docker/Dockerfile         | 22 +++++++++----------
 .../main/docker/configure-jmx-credentials.sh  |  8 +++----
 .../src/main/docker/configure-metrics.sh      |  2 +-
 .../src/main/docker/configure-persistence.sh  | 18 +++++++--------
 .../docker/configure-webui-authentication.sh  | 10 ++++-----
 src/server/src/main/docker/entrypoint.sh      | 12 +++++-----
 8 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/docs/docs/configuration/docker_vars/index.html b/docs/docs/configuration/docker_vars/index.html
index 76a4903bf..136422f79 100644
--- a/docs/docs/configuration/docker_vars/index.html
+++ b/docs/docs/configuration/docker_vars/index.html
@@ -336,7 +336,7 @@ <h2 id="using-address-translator-mapping">Using Address translator mapping</h2>
 <p>Example :</p>
 <pre><code>REAPER_CASS_ADDRESS_TRANSLATOR_TYPE=multiIpPerNode
 REAPER_CASS_ADDRESS_TRANSLATOR_MAPPING=host1:ip1,host2:ip2
-</code></pre><p>config bloc at the container startup file &lsquo;/etc/cassandra-reaper.yml&rsquo; :</p>
+</code></pre><p>config bloc at the container startup file &lsquo;/etc/reaper/cassandra-reaper.yml&rsquo; :</p>
 <pre><code> addressTranslator:
     type: multiIpPerNode
     ipTranslations:
diff --git a/src/docs/content/docs/configuration/docker_vars.md b/src/docs/content/docs/configuration/docker_vars.md
index 5d112a248..d25d5ff5f 100644
--- a/src/docs/content/docs/configuration/docker_vars.md
+++ b/src/docs/content/docs/configuration/docker_vars.md
@@ -72,7 +72,7 @@ Example :
 REAPER_CASS_ADDRESS_TRANSLATOR_TYPE=multiIpPerNode
 REAPER_CASS_ADDRESS_TRANSLATOR_MAPPING=host1:ip1,host2:ip2
 ```
-config bloc at the container startup file '/etc/cassandra-reaper.yml' :
+config bloc at the container startup file '/etc/reaper/cassandra-reaper.yml' :
 ```
  addressTranslator:
     type: multiIpPerNode
diff --git a/src/server/src/main/docker/Dockerfile b/src/server/src/main/docker/Dockerfile
index aa54a5d4b..33ae46b8c 100644
--- a/src/server/src/main/docker/Dockerfile
+++ b/src/server/src/main/docker/Dockerfile
@@ -86,8 +86,8 @@ RUN apk add --update \
   && rm -rf /var/cache/apk/*
 
 
-ADD cassandra-reaper.yml /etc/cassandra-reaper.yml
-ADD shiro.ini /etc/shiro.ini
+ADD cassandra-reaper.yml /etc/reaper/cassandra-reaper.yml
+ADD shiro.ini /etc/reaper/shiro.ini
 ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 ADD configure-persistence.sh /usr/local/bin/configure-persistence.sh
 ADD configure-metrics.sh /usr/local/bin/configure-metrics.sh
@@ -97,18 +97,18 @@ ADD ${SHADED_JAR} /usr/local/lib/cassandra-reaper.jar
 ADD spreaper /usr/local/bin/spreaper
 
 
-# get around `/usr/local/bin/configure-persistence.sh: line 65: can't create /etc/cassandra-reaper.yml: Interrupted system call` unknown error
-RUN touch /etc/cassandra-reaper.yml
-# get around `/usr/local/bin/configure-webui-authentication.sh: line 44: can't `create` /etc/shiro.ini: Interrupted system call` unknown error
-RUN touch /etc/shiro.ini
+# get around `/usr/local/bin/configure-persistence.sh: line 65: can't create /etc/reaper/cassandra-reaper.yml: Interrupted system call` unknown error
+RUN touch /etc/reaper/cassandra-reaper.yml
+# get around `/usr/local/bin/configure-webui-authentication.sh: line 44: can't `create` /etc/reaper/shiro.ini: Interrupted system call` unknown error
+RUN touch /etc/reaper/shiro.ini
 
 
 RUN addgroup -g 1001 -S reaper && adduser -G reaper -S -u 1001 reaper && \
     mkdir -p /var/lib/cassandra-reaper && \
-    mkdir -p /etc/cassandra-reaper/shiro && \
+    mkdir -p /etc/reaper/shiro && \
     mkdir -p /var/log/cassandra-reaper && \
     chown reaper:reaper \
-        /etc/cassandra-reaper.yml \
+        /etc/reaper/cassandra-reaper.yml \
         /usr/local/lib/cassandra-reaper.jar \
         /usr/local/bin/entrypoint.sh \
         /usr/local/bin/configure-persistence.sh \
@@ -116,10 +116,10 @@ RUN addgroup -g 1001 -S reaper && adduser -G reaper -S -u 1001 reaper && \
         /usr/local/bin/configure-metrics.sh \
         /usr/local/bin/configure-jmx-credentials.sh \
         /usr/local/bin/spreaper \
-        /etc/shiro.ini && \
+        /etc/reaper/shiro.ini && \
     chown -R reaper:reaper \
         /var/lib/cassandra-reaper \
-        /etc/cassandra-reaper/shiro \
+        /etc/reaper/shiro \
         /var/log/cassandra-reaper && \
     chmod +x \
         /usr/local/bin/entrypoint.sh \
@@ -130,7 +130,7 @@ RUN addgroup -g 1001 -S reaper && adduser -G reaper -S -u 1001 reaper && \
         /usr/local/bin/spreaper
 
 VOLUME /var/lib/cassandra-reaper
-VOLUME /etc/cassandra-reaper/shiro
+VOLUME /etc/reaper/shiro
 
 USER reaper
 
diff --git a/src/server/src/main/docker/configure-jmx-credentials.sh b/src/server/src/main/docker/configure-jmx-credentials.sh
index e6e06b859..dc8df26b7 100644
--- a/src/server/src/main/docker/configure-jmx-credentials.sh
+++ b/src/server/src/main/docker/configure-jmx-credentials.sh
@@ -17,7 +17,7 @@
 # we expect the jmx credentials to be a comma-separated list of 'user:passowrd@cluster' entries
 if [ ! -z "${REAPER_JMX_CREDENTIALS}" ]; then
 
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 jmxCredentials:
 EOT
 
@@ -29,7 +29,7 @@ EOT
     PASSWORD=$(echo "${ENTRY}" | cut -d'@' -f1 | cut -d':' -f2)
 
     # finally, write out the YAML entries
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
   ${CLUSTER}:
     username: ${USERNAME}
     password: ${PASSWORD}
@@ -41,7 +41,7 @@ fi
 
 
 if [ ! -z "${REAPER_JMX_AUTH_USERNAME}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 jmxAuth:
   username: ${REAPER_JMX_AUTH_USERNAME}
   password: ${REAPER_JMX_AUTH_PASSWORD}
@@ -50,7 +50,7 @@ EOT
 fi
 
 if [ ! -z "${CRYPTO_SYSTEM_PROPERTY_SECRET}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 cryptograph:
   type: symmetric
   systemPropertySecret: ${CRYPTO_SYSTEM_PROPERTY_SECRET}
diff --git a/src/server/src/main/docker/configure-metrics.sh b/src/server/src/main/docker/configure-metrics.sh
index 080375eb7..44002bf97 100644
--- a/src/server/src/main/docker/configure-metrics.sh
+++ b/src/server/src/main/docker/configure-metrics.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 if [ "true" = "${REAPER_METRICS_ENABLED}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 metrics:
   frequency: ${REAPER_METRICS_FREQUENCY}
   reporters: ${REAPER_METRICS_REPORTERS}
diff --git a/src/server/src/main/docker/configure-persistence.sh b/src/server/src/main/docker/configure-persistence.sh
index 98ad6b673..8cab166d3 100644
--- a/src/server/src/main/docker/configure-persistence.sh
+++ b/src/server/src/main/docker/configure-persistence.sh
@@ -16,20 +16,20 @@
 
 # Add specific jmxAddressTranslator
 if [ ! -z "${JMX_ADDRESS_TRANSLATOR_TYPE}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 jmxAddressTranslator:
   type: ${JMX_ADDRESS_TRANSLATOR_TYPE}
 EOT
 fi
 
 if [ "multiIpPerNode" = "${JMX_ADDRESS_TRANSLATOR_TYPE}" ] && [ -n "$JMX_ADDRESS_TRANSLATOR_MAPPING" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
   ipTranslations:
 EOT
 IFS=',' read -ra mappings <<< "$JMX_ADDRESS_TRANSLATOR_MAPPING"
 for mapping in "${mappings[@]}"; do
 IFS=':' read -ra mapping <<< "$mapping"
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
     - from: "${mapping[0]}"
       to: "${mapping[1]}"
 EOT
@@ -40,7 +40,7 @@ case ${REAPER_STORAGE_TYPE} in
     "cassandra")
 
 # BEGIN cassandra persistence options
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 activateQueryLogger: ${REAPER_CASS_ACTIVATE_QUERY_LOGGER}
 
 cassandra:
@@ -59,7 +59,7 @@ cassandra:
 EOT
 
 if [ "true" = "${REAPER_CASS_AUTH_ENABLED}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
   authProvider:
     type: plainText
     username: ${REAPER_CASS_AUTH_USERNAME}
@@ -68,27 +68,27 @@ EOT
 fi
 
 if [ "true" = "${REAPER_CASS_NATIVE_PROTOCOL_SSL_ENCRYPTION_ENABLED}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
   ssl:
     type: jdk
 EOT
 fi
 
 if [ "true" = "${REAPER_CASS_ADDRESS_TRANSLATOR_ENABLED}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
   addressTranslator:
     type: ${REAPER_CASS_ADDRESS_TRANSLATOR_TYPE}
 EOT
 fi
 
 if [ "multiIpPerNode" = "${REAPER_CASS_ADDRESS_TRANSLATOR_TYPE}" ] && [ -n "$REAPER_CASS_ADDRESS_TRANSLATOR_MAPPING" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
     ipTranslations:
 EOT
 IFS=',' read -ra mappings <<< "$REAPER_CASS_ADDRESS_TRANSLATOR_MAPPING"
 for mapping in "${mappings[@]}"; do
 IFS=':' read -ra mapping <<< "$mapping"
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
     - from: "${mapping[0]}"
       to: "${mapping[1]}"
 EOT
diff --git a/src/server/src/main/docker/configure-webui-authentication.sh b/src/server/src/main/docker/configure-webui-authentication.sh
index d2bb7944e..608e9b0db 100644
--- a/src/server/src/main/docker/configure-webui-authentication.sh
+++ b/src/server/src/main/docker/configure-webui-authentication.sh
@@ -18,21 +18,21 @@ if [ "false" = "${REAPER_AUTH_ENABLED}" ]; then
 fi
 
 if [ ! -z "${REAPER_SHIRO_INI}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 accessControl:
   sessionTimeout: PT10M
   shiro:
     iniConfigs: ["file:${REAPER_SHIRO_INI}"]
 EOT
 elif [ ! -z "${REAPER_AUTH_USER}" ]; then
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 accessControl:
   sessionTimeout: PT10M
   shiro:
-    iniConfigs: ["file:/etc/shiro.ini"]
+    iniConfigs: ["file:/etc/reaper/shiro.ini"]
 EOT
 else
-cat <<EOT >> /etc/cassandra-reaper.yml
+cat <<EOT >> /etc/reaper/cassandra-reaper.yml
 accessControl:
   sessionTimeout: PT10M
   shiro:
@@ -41,7 +41,7 @@ EOT
 fi
 
 if [ ! -z "${REAPER_AUTH_USER}" ]; then
-cat <<EOT2 >> /etc/shiro.ini
+cat <<EOT2 >> /etc/reaper/shiro.ini
 ${REAPER_AUTH_USER} = ${REAPER_AUTH_PASSWORD}, operator
 EOT2
 fi
diff --git a/src/server/src/main/docker/entrypoint.sh b/src/server/src/main/docker/entrypoint.sh
index cdf3e99ee..18334919f 100644
--- a/src/server/src/main/docker/entrypoint.sh
+++ b/src/server/src/main/docker/entrypoint.sh
@@ -33,8 +33,8 @@ function wait_for {
 
 if [ "$1" = 'cassandra-reaper' ]; then
 
-    # get around `/usr/local/bin/configure-persistence.sh: line 65: can't create /etc/cassandra-reaper.yml: Interrupted system call` unknown error
-    touch /etc/cassandra-reaper.yml
+    # get around `/usr/local/bin/configure-persistence.sh: line 65: can't create /etc/reaper/cassandra-reaper.yml: Interrupted system call` unknown error
+    touch /etc/reaper/cassandra-reaper.yml
 
     /usr/local/bin/configure-persistence.sh
     /usr/local/bin/configure-webui-authentication.sh
@@ -43,13 +43,13 @@ if [ "$1" = 'cassandra-reaper' ]; then
     exec java \
             ${JAVA_OPTS} \
             -cp "/usr/local/lib/*" io.cassandrareaper.ReaperApplication server \
-            /etc/cassandra-reaper.yml
+            /etc/reaper/cassandra-reaper.yml
 fi
 
 if [ "$1" = 'schema-migration' ]; then
 
-    # get around `/usr/local/bin/configure-persistence.sh: line 65: can't create /etc/cassandra-reaper.yml: Interrupted system call` unknown error
-    touch /etc/cassandra-reaper.yml
+    # get around `/usr/local/bin/configure-persistence.sh: line 65: can't create /etc/reaper/cassandra-reaper.yml: Interrupted system call` unknown error
+    touch /etc/reaper/cassandra-reaper.yml
 
     /usr/local/bin/configure-persistence.sh
     /usr/local/bin/configure-webui-authentication.sh
@@ -58,7 +58,7 @@ if [ "$1" = 'schema-migration' ]; then
     exec java \
             ${JAVA_OPTS} \
             -cp "/usr/local/lib/*" io.cassandrareaper.ReaperApplication schema-migration \
-            /etc/cassandra-reaper.yml
+            /etc/reaper/cassandra-reaper.yml
 fi
 
 if [ "$1" = 'register-clusters' ]; then