From 3c54552109779f2a76c48b9090b1a0667edec757 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Thu, 22 Aug 2024 14:20:29 +0100
Subject: [PATCH] Move DMARC report config into ~dmarc. Expected in current
 dir.

---
 states/dmarc_reports/dmarcts-report-parser.conf | 8 ++++----
 states/dmarc_reports/init.sls                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/states/dmarc_reports/dmarcts-report-parser.conf b/states/dmarc_reports/dmarcts-report-parser.conf
index 9c846fe..5bab6c1 100644
--- a/states/dmarc_reports/dmarcts-report-parser.conf
+++ b/states/dmarc_reports/dmarcts-report-parser.conf
@@ -10,10 +10,10 @@ $delete_reports = 0;
 
 # Supported types: mysql, Pg. If unset, defaults to mysql
 #$dbtype = 'mysql';
-$dbname = 'dmarc';
-$dbuser = 'dmarc';
-$dbpass = 'password';
-$dbhost = 'dbhost'; # Set the hostname if we can't connect to the local socket.
+$dbname = 'dmarcts';
+$dbuser = 'dmarcts';
+$dbpass = '{{ pillar['dmarcts']['mariadb_pw'] }}';
+$dbhost = 'localhost'; # Set the hostname if we can't connect to the local socket.
 $dbport = '3306';
 
 $imapserver       = 'localhost';
diff --git a/states/dmarc_reports/init.sls b/states/dmarc_reports/init.sls
index 2e60ea7..24c6475 100644
--- a/states/dmarc_reports/init.sls
+++ b/states/dmarc_reports/init.sls
@@ -22,7 +22,7 @@ dmarcts:
     - database: dmarcts.*
     - user: dmarcts
 
-/etc/dmarcts-report-parser.conf:
+/home/dmarc/dmarcts-report-parser.conf:
   file.managed:
     - source: salt://dmarc_reports/dmarcts-report-parser.conf
     - template: jinja