From 5cce33c7451ea3da1547f3a7e1cf418d668d1e39 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Sun, 3 May 2026 23:41:00 -0400
Subject: [PATCH 01/21] Updating the deploy to nas so it installs pip, rsync,
 sshpass

---
 .github/workflows/nas-deploy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 392e40a..57bded3 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -50,6 +50,7 @@ jobs:
 
       - name: Install tools
         run: |
+          sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
           pip install 'ansible>=11,<12'
           ansible-galaxy collection install -r docker/ansible/requirements.yaml
           SOPS_VERSION="3.9.4"

From 8f1f29bb444af0d4a04516c070357d6313c4ba99 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Sun, 3 May 2026 23:41:48 -0400
Subject: [PATCH 02/21] Fixing entry for detect step

---
 .../hlcl1/infra/gha-runners/arc-runners/chart/helmrelease.yaml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clusters/hlcl1/infra/gha-runners/arc-runners/chart/helmrelease.yaml b/clusters/hlcl1/infra/gha-runners/arc-runners/chart/helmrelease.yaml
index 06f9219..9fd494b 100644
--- a/clusters/hlcl1/infra/gha-runners/arc-runners/chart/helmrelease.yaml
+++ b/clusters/hlcl1/infra/gha-runners/arc-runners/chart/helmrelease.yaml
@@ -31,6 +31,7 @@ spec:
         containers:
           - name: runner
             image: ghcr.io/actions/actions-runner:latest
+            command: ["/home/runner/run.sh"]
             env:
               - name: NAS_SSH_KEY
                 valueFrom:

From e1276838fa1b18863b8e73c79e85ac5537810e86 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Sun, 3 May 2026 23:42:47 -0400
Subject: [PATCH 03/21] added workflow_dispatch to allow manual runs

---
 .github/workflows/nas-deploy.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 57bded3..af7b1fc 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -2,6 +2,7 @@
 name: NAS Deploy
 
 on:
+  workflow_dispatch:
   push:
     branches: [main]
     paths:

From 685b9dd9b04494ed2293c24f54c138489d5e0ee2 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Sun, 3 May 2026 23:52:09 -0400
Subject: [PATCH 04/21] adding branch to enable testing run

---
 .github/workflows/nas-deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index af7b1fc..5d0a8d8 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -4,7 +4,7 @@ name: NAS Deploy
 on:
   workflow_dispatch:
   push:
-    branches: [main]
+    branches: [main, fix/Nas_deploy_job_entry_fix]
     paths:
       - "docker/**"
       - "!docker/ansible/**"

From eef966009ffc14b7986bea9b2fc827d149e21a3f Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Sun, 3 May 2026 23:57:58 -0400
Subject: [PATCH 05/21] minor change to trigger workflow

---
 docker/openbao/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From 98503d10fa620f520e45ef647aae065f7cbeb33e Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 00:06:19 -0400
Subject: [PATCH 06/21] tell pip to ignore outside management of python/pip
 packages

---
 .github/workflows/nas-deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 5d0a8d8..6763fc1 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -52,7 +52,7 @@ jobs:
       - name: Install tools
         run: |
           sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
-          pip install 'ansible>=11,<12'
+          pip install --break-system-packages 'ansible>=11,<12'
           ansible-galaxy collection install -r docker/ansible/requirements.yaml
           SOPS_VERSION="3.9.4"
           curl -fsSL \

From 5ece7773c29171847a2b933aea9ebc94d9136274 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 00:12:28 -0400
Subject: [PATCH 07/21] Revert start period to 10s

---
 docker/openbao/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From dd2308ea552686bfda2b04ff9c78b57bd480f3ed Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 00:18:18 -0400
Subject: [PATCH 08/21] added local dir's to my GITHUB_PATH on my gha runner
 env

---
 .github/workflows/nas-deploy.yaml  | 1 +
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 6763fc1..40c349b 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -53,6 +53,7 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
           pip install --break-system-packages 'ansible>=11,<12'
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
           ansible-galaxy collection install -r docker/ansible/requirements.yaml
           SOPS_VERSION="3.9.4"
           curl -fsSL \
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From 3a90fc6ec442bc627ac4ee231c459c0bc4f13b7c Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 00:33:05 -0400
Subject: [PATCH 09/21] expanding /Users/rgardner

---
 .github/workflows/nas-deploy.yaml  | 2 +-
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 40c349b..d260ba6 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -53,7 +53,7 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
           pip install --break-system-packages 'ansible>=11,<12'
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          echo "/home/runner/.local/bin" >> $GITHUB_PATH
           ansible-galaxy collection install -r docker/ansible/requirements.yaml
           SOPS_VERSION="3.9.4"
           curl -fsSL \
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From e847635f890feb7403432b004039b195ff0129d3 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 00:40:27 -0400
Subject: [PATCH 10/21] explicity adding path to ansible-galaxy path

---
 .github/workflows/nas-deploy.yaml  | 4 ++--
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index d260ba6..70c82d7 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -53,8 +53,8 @@ jobs:
         run: |
           sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
           pip install --break-system-packages 'ansible>=11,<12'
-          echo "/home/runner/.local/bin" >> $GITHUB_PATH
-          ansible-galaxy collection install -r docker/ansible/requirements.yaml
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+          $HOME/.local/bin/ansible-galaxy collection install -r docker/ansible/requirements.yaml
           SOPS_VERSION="3.9.4"
           curl -fsSL \
             "https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux.amd64" \
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From e328e48464bc5a97ba69fe1992a0218c3be16112 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 00:53:52 -0400
Subject: [PATCH 11/21] download sops to tmp then move via sudo

---
 .github/workflows/nas-deploy.yaml  | 5 +++--
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 70c82d7..9510c6a 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -58,8 +58,9 @@ jobs:
           SOPS_VERSION="3.9.4"
           curl -fsSL \
             "https://github.com/getsops/sops/releases/download/v${SOPS_VERSION}/sops-v${SOPS_VERSION}.linux.amd64" \
-            -o /usr/local/bin/sops
-          chmod +x /usr/local/bin/sops
+            -o /tmp/sops
+          sudo mv /tmp/sops /usr/local/bin/sops
+          sudo chmod +x /usr/local/bin/sops
 
       - name: Set up SSH and age key
         run: |
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From 6baeab698e36e4b7ff3a089f90c3f8498e49026a Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 01:06:50 -0400
Subject: [PATCH 12/21] Tell sops what sort of file to expect

---
 .github/workflows/nas-deploy.yaml  | 2 +-
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 9510c6a..5c8d051 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -78,7 +78,7 @@ jobs:
           for stack in $(echo "${{ needs.detect.outputs.stacks }}" | tr ',' ' '); do
             if [[ -f "docker/$stack/.env.sops" ]]; then
               echo "Decrypting docker/$stack/.env.sops"
-              sops --decrypt "docker/$stack/.env.sops" > "docker/$stack/.env"
+              sops --decrypt --input-type dotenv --output-type dotenv "docker/$stack/.env.sops" > "docker/$stack/.env"
             fi
           done
 
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From 8c6dd462354c999931c966adcdc3849b5a173b0f Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 01:16:44 -0400
Subject: [PATCH 13/21] debugging sops setup

---
 .github/workflows/nas-deploy.yaml  | 3 +++
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 5c8d051..e5f1ada 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -72,6 +72,9 @@ jobs:
           chmod 644 ~/.ssh/known_hosts
           printf '%s\n' "$SOPS_AGE_KEY" > ~/.config/sops/age/keys.txt
           chmod 600 ~/.config/sops/age/keys.txt
+          echo "keys.txt size: $(wc -c < ~/.config/sops/age/keys.txt)"
+          echo "keys.txt lines: $(wc -l < ~/.config/sops/age/keys.txt)"
+          cat ~/.config/sops/age/keys.txt | grep -c "^AGE-SECRET-KEY" || echo "no AGE-SECRET-KEY line found"
 
       - name: Decrypt .env files
         run: |
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From 97a1e18cde8c120aff284913cba6ec7c8baef401 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 10:28:09 -0400
Subject: [PATCH 14/21] dry running while openbao still up to test entire
 workflow

---
 .github/workflows/nas-deploy.yaml  | 2 +-
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index e5f1ada..d5761fc 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -109,7 +109,7 @@ jobs:
         run: |
           ansible-playbook \
             -i docker/ansible/inventory.yaml \
-            -e "stacks=${{ needs.detect.outputs.stacks }}" \
+            -e "stacks=${{ needs.detect.outputs.stacks }}" --check \
             docker/ansible/deploy.yaml
 
       - name: Clean up secrets
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From 57f81c6490001290b6c45fc578ad64c3dce7f48f Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 11:28:43 -0400
Subject: [PATCH 15/21] deubbing vars

---
 .github/workflows/nas-deploy.yaml  | 6 ++++++
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index d5761fc..152f540 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -49,6 +49,12 @@ jobs:
           echo "::add-mask::$NAS_USER"
           echo "::add-mask::$SOPS_AGE_KEY"
 
+      - name: Debug secret lengths
+        run: |
+          echo "SOPS_AGE_KEY length: ${#SOPS_AGE_KEY}"
+          echo "NAS_SSH_KEY length: ${#NAS_SSH_KEY}"
+          echo "NAS_HOST length: ${#NAS_HOST}"
+
       - name: Install tools
         run: |
           sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From 9d8f57dab932e3508cca85441ed9f92a2f1ee8c8 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 13:24:36 -0400
Subject: [PATCH 16/21] workaround for nerfed path env by UGOS

---
 .github/workflows/nas-deploy.yaml  | 10 ++--------
 docker/openbao/docker-compose.yaml |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index 152f540..c2fd96d 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -49,12 +49,6 @@ jobs:
           echo "::add-mask::$NAS_USER"
           echo "::add-mask::$SOPS_AGE_KEY"
 
-      - name: Debug secret lengths
-        run: |
-          echo "SOPS_AGE_KEY length: ${#SOPS_AGE_KEY}"
-          echo "NAS_SSH_KEY length: ${#NAS_SSH_KEY}"
-          echo "NAS_HOST length: ${#NAS_HOST}"
-
       - name: Install tools
         run: |
           sudo apt-get update && sudo apt-get install -y python3-pip rsync sshpass
@@ -100,14 +94,14 @@ jobs:
               --exclude 'config/' \
               -e "$SSH_CMD" \
               "docker/$stack/" \
-              "${NAS_USER}@${NAS_HOST}:/volume3/docker_compose/$stack/"
+              "${NAS_USER}@${NAS_HOST}:/docker_compose/$stack/"
 
             if [[ -d "docker/$stack/config" ]]; then
               echo "Syncing config files for stack: $stack"
               rsync -avz \
                 -e "$SSH_CMD" \
                 "docker/$stack/config/" \
-                "${NAS_USER}@${NAS_HOST}:/volume3/docker_config/$stack/"
+                "${NAS_USER}@${NAS_HOST}:/docker_config/$stack/"
             fi
           done
 
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From fbff36b31ad192a7ca5b3fedd4ade7827b901660 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 13:59:47 -0400
Subject: [PATCH 17/21] reset path after testing

---
 .github/workflows/nas-deploy.yaml  | 4 ++--
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index c2fd96d..d5761fc 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -94,14 +94,14 @@ jobs:
               --exclude 'config/' \
               -e "$SSH_CMD" \
               "docker/$stack/" \
-              "${NAS_USER}@${NAS_HOST}:/docker_compose/$stack/"
+              "${NAS_USER}@${NAS_HOST}:/volume3/docker_compose/$stack/"
 
             if [[ -d "docker/$stack/config" ]]; then
               echo "Syncing config files for stack: $stack"
               rsync -avz \
                 -e "$SSH_CMD" \
                 "docker/$stack/config/" \
-                "${NAS_USER}@${NAS_HOST}:/docker_config/$stack/"
+                "${NAS_USER}@${NAS_HOST}:/volume3/docker_config/$stack/"
             fi
           done
 
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From ded866f26e27706be6eba094adeed48f92490918 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 18:03:18 -0400
Subject: [PATCH 18/21] trying path after enabling rsync on ugreen

---
 .github/workflows/nas-deploy.yaml  | 4 ++--
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index d5761fc..c2fd96d 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -94,14 +94,14 @@ jobs:
               --exclude 'config/' \
               -e "$SSH_CMD" \
               "docker/$stack/" \
-              "${NAS_USER}@${NAS_HOST}:/volume3/docker_compose/$stack/"
+              "${NAS_USER}@${NAS_HOST}:/docker_compose/$stack/"
 
             if [[ -d "docker/$stack/config" ]]; then
               echo "Syncing config files for stack: $stack"
               rsync -avz \
                 -e "$SSH_CMD" \
                 "docker/$stack/config/" \
-                "${NAS_USER}@${NAS_HOST}:/volume3/docker_config/$stack/"
+                "${NAS_USER}@${NAS_HOST}:/docker_config/$stack/"
             fi
           done
 
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From 38a9a69295757531fc80af2fbddd257623201d2f Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 18:41:44 -0400
Subject: [PATCH 19/21] add rsync option to not set time on dir's

---
 .github/workflows/nas-deploy.yaml  | 2 +-
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index c2fd96d..e31721f 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -90,7 +90,7 @@ jobs:
           SSH_CMD="ssh -i ~/.ssh/nas_deploy_key -o StrictHostKeyChecking=yes"
           for stack in $(echo "${{ needs.detect.outputs.stacks }}" | tr ',' ' '); do
             echo "Syncing compose files for stack: $stack"
-            rsync -avz --delete \
+            rsync -avzO --delete \
               --exclude 'config/' \
               -e "$SSH_CMD" \
               "docker/$stack/" \
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s

From 98cd2d2ddb274e11f75a5fa7c21a56eebc4aa731 Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 19:05:03 -0400
Subject: [PATCH 20/21] Missed skipping setting time on second rsync

---
 .github/workflows/nas-deploy.yaml  | 2 +-
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index e31721f..fba2797 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -98,7 +98,7 @@ jobs:
 
             if [[ -d "docker/$stack/config" ]]; then
               echo "Syncing config files for stack: $stack"
-              rsync -avz \
+              rsync -avzO \
                 -e "$SSH_CMD" \
                 "docker/$stack/config/" \
                 "${NAS_USER}@${NAS_HOST}:/docker_config/$stack/"
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index 7e72413..ac0ad8b 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 10s
+      start_period: 12s

From 2c2ee8dc4ad6f904be5d2b4f8500220800262f5f Mon Sep 17 00:00:00 2001
From: Rick Gardner <Rick@r.gardner.jr@gmail.com>
Date: Mon, 4 May 2026 19:26:34 -0400
Subject: [PATCH 21/21] cleanup debugging work and revert back to final state

---
 .github/workflows/nas-deploy.yaml  | 7 ++-----
 docker/openbao/docker-compose.yaml | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nas-deploy.yaml b/.github/workflows/nas-deploy.yaml
index fba2797..12e9f98 100644
--- a/.github/workflows/nas-deploy.yaml
+++ b/.github/workflows/nas-deploy.yaml
@@ -4,7 +4,7 @@ name: NAS Deploy
 on:
   workflow_dispatch:
   push:
-    branches: [main, fix/Nas_deploy_job_entry_fix]
+    branches: [main]
     paths:
       - "docker/**"
       - "!docker/ansible/**"
@@ -72,9 +72,6 @@ jobs:
           chmod 644 ~/.ssh/known_hosts
           printf '%s\n' "$SOPS_AGE_KEY" > ~/.config/sops/age/keys.txt
           chmod 600 ~/.config/sops/age/keys.txt
-          echo "keys.txt size: $(wc -c < ~/.config/sops/age/keys.txt)"
-          echo "keys.txt lines: $(wc -l < ~/.config/sops/age/keys.txt)"
-          cat ~/.config/sops/age/keys.txt | grep -c "^AGE-SECRET-KEY" || echo "no AGE-SECRET-KEY line found"
 
       - name: Decrypt .env files
         run: |
@@ -109,7 +106,7 @@ jobs:
         run: |
           ansible-playbook \
             -i docker/ansible/inventory.yaml \
-            -e "stacks=${{ needs.detect.outputs.stacks }}" --check \
+            -e "stacks=${{ needs.detect.outputs.stacks }}" \
             docker/ansible/deploy.yaml
 
       - name: Clean up secrets
diff --git a/docker/openbao/docker-compose.yaml b/docker/openbao/docker-compose.yaml
index ac0ad8b..7e72413 100644
--- a/docker/openbao/docker-compose.yaml
+++ b/docker/openbao/docker-compose.yaml
@@ -22,4 +22,4 @@ services:
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 12s
+      start_period: 10s