From a336bb9432eb003f7c3fc6dd7d844350dd77d257 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Wed, 15 Apr 2020 12:58:37 +0200
Subject: [PATCH] Use new filter

---
 deploy.d/plays/predeploy.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/deploy.d/plays/predeploy.yml b/deploy.d/plays/predeploy.yml
index c77aa35..53beaea 100644
--- a/deploy.d/plays/predeploy.yml
+++ b/deploy.d/plays/predeploy.yml
@@ -23,15 +23,13 @@
 - name: Store gitea git user uid/guid in config.env
   set_fact:
     config: "{{
-      config |
-      default({}) |
-      combine({'env': {
+      config | update_env({
         'USER_GID': getent_passwd['git'][1],
         'USER_UID': getent_passwd['git'][2],
-      }})
+      })
     }}"
 
-- name: DEBUG -> Show me the config setup again
+- name: Output config for debugging purposes
   debug:
     msg: "{{ config }}"