From 8c6dcadca043079ea45809f591076a5c2d73cf8a Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 25 Oct 2018 14:58:18 +0200
Subject: [PATCH] =?UTF-8?q?[fix]=C2=A0fixing=20default=5Fspf=5Fvalue=20and?=
 =?UTF-8?q?=20default=5Fdmarc=5Fvalue=20NOT=20being=20initialized=20at=20r?=
 =?UTF-8?q?untime.=20Do=20it=20at=20alternc.instal=20time.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/alternc.install |  3 +++
 install/variables.php   | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 install/variables.php

diff --git a/install/alternc.install b/install/alternc.install
index d6a0b514..4385ddbb 100755
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -596,6 +596,9 @@ fi
 chmod 640 /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
 chown alterncpanel:adm /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
 
+# Launch a script that will populate AlternC variables as needed
+su - alterncpanel -s /bin/bash -c /usr/share/alternc/install/variables.php
+
 # Creating admin user if needed
 HAS_ROOT=`mysql --defaults-file=/etc/alternc/my.cnf -e "SELECT COUNT(*) FROM membres WHERE login = 'admin' OR login = 'root' and su = 1" | tail -1`
 
diff --git a/install/variables.php b/install/variables.php
new file mode 100644
index 00000000..f07cf92f
--- /dev/null
+++ b/install/variables.php
@@ -0,0 +1,17 @@
+#!/usr/bin/php
+<?php
+/**
+ * This script set the required variables for AlternC at install time. 
+ * only create missing variable, don't overwrite them
+ */
+
+// bootstrap
+if(!chdir("/usr/share/alternc/panel"))
+exit(1);
+require("/usr/share/alternc/panel/class/config_nochk.php");
+
+variable_set('default_spf_value','a mx ?all', 'This variable (if set) tells the SPF/TXT DNS field that will be published as a SPF entry, telling which server(s) are allowed to send email for this one. You can still change it later in the advanced DNS entries for ONE domain, this entry is only set once for new domains (or when you change it here).');
+
+variable_set('default_dmarc_value', 'p=none;pct=100;rua=%%ADMINMAIL%%;aspf=r;adkim=r', 'This variable (if set) tells the DMARC/TXT DNS field that will be published as a DMARC entry, telling which policy you apply to this domain name. You can still change it later in the advanced DNS entries for ONE domain, this entry is only set once for new domains (or when you change it here). You can use %%ADMINMAIL%% or %%USERMAIL%% to substitute to admin-account or alternc user-account email address.');
+//  strict dmarc would be  'p=reject;pct=100;rua=%%ADMINMAIL%%;aspf=s;adkim=s'
+