added per host commands

.idea/misc.xml

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.4.3 (/usr/bin/python3.4)" project-jdk-type="Python SDK" />
 </project>

apache/sitegen.conf

@@ -1,4 +1,7 @@
 Alias "/.well-known/acme-challenge/" "/tmp/acme-challenge/.well-known/acme-challenge/"
+<IfModule mod_proxy.c>
+  ProxyPass /.well-known/acme-challenge !
+</IfModule>
 <Directory /tmp/acme-challenge>
   Options -Indexes -FollowSymLinks
   AllowOverride All
@@ -6,3 +9,8 @@ Alias "/.well-known/acme-challenge/" "/tmp/acme-challenge/.well-known/acme-chall
   Satisfy Any
   Allow from all
 </Directory>
+<Location /.well-known/acme-challenge>
+  Require all granted
+  Satisfy Any
+  Allow from all
+</Location>

install

@@ -10,6 +10,7 @@ then
   cp -r "${dir}/sitegen" /etc/sitegen
 fi &&
 
+rm -f /usr/local/bin/sitegen &&
 cp "${dir}/sitegen.py" /usr/local/bin/sitegen &&
 
 for typedir in "${dir}"/sitegen/hooks-available/*
@@ -22,9 +23,10 @@ do
     done
 done &&
 
+rm -f /etc/bash_completion.d/sitegen &&
 cp "${dir}/bash/sitegen.completion" /etc/bash_completion.d/sitegen &&
 
-a2disconf letsencrypt &&
+(a2disconf letsencrypt && rm -f /etc/apache2/conf-available/letsencrypt.conf || exit 0) &&
 rm -f /etc/apache2/conf-available/sitegen.conf &&
 cp "${dir}/apache/sitegen.conf" /etc/apache2/conf-available/sitegen.conf &&
 a2enconf sitegen &&

sitegen.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env python3
-
+import fnmatch
 import json
 import argparse
 import os
@@ -26,8 +26,7 @@ class SiteGen:
     hooksAvailableDir = ""
     templatesDir = ""
     certRenewTime = ""
-    letsencryptCommand = ""
-    letsencryptArgs = []
+    letsencryptCommands = ""
     letsencryptDir = ""
     certDir = ""
 
@@ -39,8 +38,7 @@ class SiteGen:
         self.hooksAvailableDir = path.join(self.confDir, "hooks-available")
         self.templatesDir = path.join(self.confDir, "templates")
         self.certRenewTime = config["certRenewTime"]
-        self.letsencryptCommand = config["letsencryptCommand"]
-        self.letsencryptArgs = config["letsencryptArgs"]
+        self.letsencryptCommands = config["letsencryptCommands"]
         self.letsencryptDir = config["letsencryptDir"]
         self.certDir = config["certDir"]
 
@@ -74,6 +72,14 @@ class SiteGen:
     def get_letsencrypt_dir(self, domain):
         return path.join(self.letsencryptDir, domain)
 
+    def get_letsencrypt_command(self, domain):
+        for d in self.letsencryptCommands:
+            patterns = d['patterns'] if isinstance(d['patterns'], list) else [d['patterns']]
+            for pattern in patterns:
+                if fnmatch.fnmatch(domain, pattern):
+                    return d['command']
+        return None
+
     def symlink_letsencrypt_file(self, domain, file, outfile):
         letsencrypt_cert_file = path.abspath(self.get_letsencrypt_dir(domain))
         my_cert_file = path.join(self.certDir, outfile)
@@ -193,11 +199,13 @@ class SiteGen:
         cert_files.insert(0, domain)
         self.execute_hooks("cert", "pre", cert_files)
 
-        args = self.letsencryptArgs.copy()
+        command = self.get_letsencrypt_command(domain)
+
+        args = command['letsencryptArgs'].copy()
         args.append("-d")
         args.append(domain)
 
-        res, out = self.execute(self.letsencryptCommand, args, False)
+        res, out = self.execute(command['letsencryptCommand'], args, False)
         if res != 0:
             raise SiteGenException("Certificate request failed with code %i" % res, res)
 

sitegen/sitegen.json

@@ -3,17 +3,40 @@
   "siteDir": "/var/",
   "confDir": "/etc/sitegen/",
   "certRenewTime": 5356800,
-  "letsencryptCommand": "letsencrypt",
-  "letsencryptArgs": [
-    "--agree-tos",
-    "--text",
-    "--renew-by-default",
-    "--webroot",
-    "--webroot-path",
-    "/tmp/acme-challenge/",
-    "--server",
-    "https://acme-v01.api.letsencrypt.org/directory",
-    "certonly"
+  "letsencryptCommands": [
+    {
+      "patterns": "*",
+      "command": {
+        "letsencryptCommand": "letsencrypt",
+        "letsencryptArgs": [
+          "--agree-tos",
+          "--text",
+          "--renew-by-default",
+          "--webroot",
+          "--webroot-path",
+          "/tmp/acme-challenge/",
+          "--server",
+          "https://acme-v01.api.letsencrypt.org/directory",
+          "certonly"
+        ]
+      }
+    },
+    {
+      "patterns": "*",
+      "command": {
+        "letsencryptCommand": "letsencrypt",
+        "letsencryptArgs": [
+          "--agree-tos",
+          "--text",
+          "--renew-by-default",
+          "--authenticator",
+          "certbot-dns:auth",
+          "--server",
+          "https://acme-v01.api.letsencrypt.org/directory",
+          "certonly"
+        ]
+      }
+    }
   ],
   "letsencryptDir": "/etc/letsencrypt/live/",
   "certDir": "/etc/ssl/private/"

tests/fake-letsencrypt.sh

@@ -5,9 +5,9 @@ arg="${1}"
 d="${2}"
 host="${3}"
 
-if [ "${host}" = "error.com" ] || [ "${arg}" != "Test." ] || [ "${d}" != "-d" ]
+if [ "${arg}" != "Test." ] || [ "${d}" != "-d" ]
 then
-    echo "Failed to get certificate" >&2
+    echo "Failed to get certificate: ${arg}" >&2
     exit 1
 fi &&
 

tests/sitegen.json

@@ -3,9 +3,28 @@
   "siteDir": "./tests/var/",
   "confDir": "./sitegen/",
   "certRenewTime": 5356800,
-  "letsencryptCommand": "./tests/fake-letsencrypt.sh",
-  "letsencryptArgs": [
-    "Test."
+  "letsencryptCommands": [
+    {
+      "patterns": [
+        "error.com",
+        "*.error.com"
+      ],
+      "command": {
+        "letsencryptCommand": "./tests/fake-letsencrypt.sh",
+        "letsencryptArgs": [
+          "error"
+        ]
+      }
+    },
+    {
+      "patterns": "*",
+      "command": {
+        "letsencryptCommand": "./tests/fake-letsencrypt.sh",
+        "letsencryptArgs": [
+          "Test."
+        ]
+      }
+    }
   ],
   "letsencryptDir": "./tests/etc/letsencrypt/live/",
   "certDir": "./tests/etc/ssl/private/"