From ef4ee7be28829cf04bc7c886d60912ba8dad8f22 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 15 Apr 2021 14:57:57 +0200
Subject: [PATCH] domain option dkim

---
 hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java   | 4 +++-
 hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java | 1 +
 hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java    | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
index e953e4a..3db58e2 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
@@ -29,6 +29,7 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 	public static final String DOMOPT_BACKUPFOREXTERNALMX = "backupmxforexternalmx";
 	public static final String DOMOPT_LETSENCRYPT = "letsencrypt";
 	public static final String DOMOPT_AUTOCONFIG = "autoconfig";
+	public static final String DOMOPT_DKIM = "dkim";
 	
 	public static final String[] ALL_DOMOPTS = 
 			new String[] { 
@@ -39,7 +40,8 @@ public class DomainModuleImpl extends AbstractModuleImpl {
 					DOMOPT_INCLUDES, 
 					DOMOPT_BACKUPFOREXTERNALMX,
 					DOMOPT_LETSENCRYPT,
-					DOMOPT_AUTOCONFIG
+					DOMOPT_AUTOCONFIG,
+					DOMOPT_DKIM
 			};
 	public static final String[] DEFAULT_DOMOPTS = 
 			new String[] { 
diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java b/hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java
index 0857321..e2ff9d4 100644
--- a/hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java
+++ b/hsarback/src/de/hsadmin/mods/dom/DomainOptionValues.java
@@ -26,6 +26,7 @@ public class DomainOptionValues extends DefaultSelectableValues {
 		list.add(new BooleanListValue("multiviews"));
 		list.add(new BooleanListValue("letsencrypt"));
 		list.add(new BooleanListValue("autoconfig"));
+		list.add(new BooleanListValue("dkim"));
 		return list;
 	}
 
diff --git a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
index c8ef4fb..ff9042a 100644
--- a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
+++ b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
@@ -162,10 +162,6 @@ public class JsonPillarServlet extends HttpServlet {
 					writer.println("        , \"" + optName + "\": " + optValue.toString().toLowerCase());
 				}
 			}
-			// begin DKIM Test 
-			final String dkimOpt = ("wikv.de".equals(domName) || "meinblog.de".equals(domName)) ? "true" : "false";
-			writer.println("        , \"" + "dkim" + "\": " + dkimOpt);
-			// end DKIM Test 
 			writer.println("      }");
 			writer.println("      , \"validsubdomains\": \"" + validSubdomainNames + "\"");
 			writer.println("    }");