From 64069181d6c4be3601df6dd7532d450043887059 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Wed, 15 Apr 2020 11:58:24 +0200
Subject: [PATCH] Pass env vars through pre-deploy hook

---
 deploy.d/config.yml          | 2 --
 deploy.d/plays/predeploy.yml | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/deploy.d/config.yml b/deploy.d/config.yml
index 1ebf9cd..3d6b892 100644
--- a/deploy.d/config.yml
+++ b/deploy.d/config.yml
@@ -59,6 +59,4 @@ env:
   SSH_LISTEN_PORT: "2222"
   SSH_PORT: "222"
   STARTUP_TIMEOUT: "0"
-  USER_GID: "{{ vars.git_user_guid }}"
-  USER_UID: "{{ vars.git_user_uid }}"
   WHITELIST_URIS: "https://{{ vars.domain }}"
diff --git a/deploy.d/plays/predeploy.yml b/deploy.d/plays/predeploy.yml
index cff8230..98824f9 100644
--- a/deploy.d/plays/predeploy.yml
+++ b/deploy.d/plays/predeploy.yml
@@ -20,14 +20,14 @@
     key: git
     split: ":"
 
-- name: Store gitea git user uid/guid in config.vars
+- name: Store gitea git user uid/guid in config.env
   set_fact:
     config: "{{
-      config.vars |
+      config.env |
       default({}) |
       combine({
-        'git_user_uid': getent_passwd['git'][1],
-        'git_user_guid': getent_passwd['git'][2],
+        'USER_GID': getent_passwd['git'][1],
+        'USER_UID': getent_passwd['git'][2],
       })
     }}"