From 5df0e0d16f12b78241c214cc7b266d700090f9d1 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Wed, 11 Sep 2019 16:58:52 -0500
Subject: [PATCH] Tweak how backups are configured, to be a tad more generic

---
 rattail_fabric/backup.py                            | 13 ++++++++++---
 rattail_fabric/deploy/backup/backup-everything.mako |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/rattail_fabric/backup.py b/rattail_fabric/backup.py
index 9150f53..722cef0 100644
--- a/rattail_fabric/backup.py
+++ b/rattail_fabric/backup.py
@@ -54,11 +54,15 @@ def deploy_backup_app(deploy, envname, mkvirtualenv=True, user='rattail',
     Make an app which can run backups for the server.
     """
     if not config:
-        path = '{}/rattail.conf'.format(envname)
+        path = '{}/rattail.conf.mako'.format(envname)
         if deploy.local_exists(path):
             config = path
         else:
-            raise ValueError("Must provide config path for backup app")
+            path = '{}/rattail.conf'.format(envname)
+            if deploy.local_exists(path):
+                config = path
+            else:
+                raise ValueError("Must provide config path for backup app")
 
     if runat is UNSPECIFIED:
         runat = datetime.time(0) # defaults to midnight
@@ -82,7 +86,10 @@ def deploy_backup_app(deploy, envname, mkvirtualenv=True, user='rattail',
 
         # config
         sudo('bin/rattail make-appdir', user=user)
-        deploy(config, 'app/rattail.conf', owner=user, mode='0600')
+        config_context = {
+            'user': user,
+        }
+        deploy(config, 'app/rattail.conf', owner=user, mode='0600', context=config_context)
         sudo('bin/rattail -c app/rattail.conf make-config -T quiet -O app/', user=user)
         sudo('bin/rattail -c app/rattail.conf make-config -T silent -O app/', user=user)
 
diff --git a/rattail_fabric/deploy/backup/backup-everything.mako b/rattail_fabric/deploy/backup/backup-everything.mako
index 0f37d8b..cd30941 100755
--- a/rattail_fabric/deploy/backup/backup-everything.mako
+++ b/rattail_fabric/deploy/backup/backup-everything.mako
@@ -26,7 +26,7 @@ if [ "$(sudo -u ${user} git status --porcelain)" != '' ]; then
    exit 1
 fi
 sudo -u ${user} git pull $QUIET
-sudo -u ${user} find . -name '*.pyc' -delete
+sudo find . -name '*.pyc' -delete
 $PIP install $QUIET --upgrade --upgrade-strategy eager --editable .
 
 # run backup