From a426b483ba3daec1238e119ccd1346118429fc37 Mon Sep 17 00:00:00 2001 From: Michael Lustfield Date: Mon, 19 Feb 2024 01:44:45 -0600 Subject: [PATCH] Clean up salt requisites --- states/webapps/nginx-cfg/soberpage.conf | 2 +- states/webapps/soberpage.sls | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/states/webapps/nginx-cfg/soberpage.conf b/states/webapps/nginx-cfg/soberpage.conf index 96c7b6c..8ac86e3 100644 --- a/states/webapps/nginx-cfg/soberpage.conf +++ b/states/webapps/nginx-cfg/soberpage.conf @@ -3,7 +3,7 @@ # Note: Only external redirects should be hanlded by this server block. ## map $host $canonical_redirect { - default "https://about.sobersupport.group/unconfigured"; + default https://about.sobersupport.group/unconfigured/; include canonical_redirects.map; } server { diff --git a/states/webapps/soberpage.sls b/states/webapps/soberpage.sls index 3c76517..b72728a 100644 --- a/states/webapps/soberpage.sls +++ b/states/webapps/soberpage.sls @@ -13,7 +13,7 @@ soberpage: - source: salt://webapps/nginx-cfg/soberpage.conf - require: - pkg: nginx - - onchanges_in: + - watch_in: - service: nginx cmd.run: - name: "/srv/webapps/soberpage/sync -n -d /srv/webapps/soberpage/data/domains" @@ -22,7 +22,7 @@ soberpage: - git: soberpage - onchanges: - git: soberpage - - onchanges_in: + - watch_in: - service: nginx cron.present: - name: "/srv/webapps/soberpage/sync -n -d /srv/webapps/soberpage/data/domains && service nginx reload"