v3.1.0 (#74)

# New features
* Allowing individual SSL certificate to be regenerated
* Adding custom configuration support to proxy conf

Author: bfren

VERSION

@@ -1 +1 @@
-3.0.4
+3.1.0

VERSION_MINOR

@@ -1 +1 @@
-3.0
+3.1

overlay/etc/bf/templates/nginx-proxy.conf.esh

@@ -45,6 +45,9 @@ server {
     # include secure headers
     include                         helpers/proxy-secure-headers.conf;
 
+    # include custom configuration
+    include                         <%= "${CUSTOM_CONF}/*.conf" %>;
+
     # include standard helpers
     include                         helpers/nginx-ignore-favicon.conf;
     include                         helpers/nginx-static-files.conf;

overlay/usr/bin/bf/ssl-regenerate

@@ -5,12 +5,33 @@ export BF_E=`basename ${0}`
 
 
 #======================================================================================================================
-# Delete SSL files and reinitialise.
+# Remove specified domain (or all domains).
 #======================================================================================================================
 
-bf-echo "Removing SSL certificates and configuration..."
-bf-rmrf "${PROXY_SSL_CERTS}/*"
-bf-done
+if [ -n "${1-}" ] ; then
+
+    DOMAIN=${1}
+    [[ ! -d "${PROXY_SSL_CERTS}/${DOMAIN}" ]] && bf-error "Domain ${DOMAIN} has not been setup for SSL."
+
+    bf-echo "Removing SSL certificates and configuration for ${DOMAIN}..."
+    rm -r \
+        "${PROXY_SSL_CERTS}/${DOMAIN}" \
+        "${PROXY_SSL_CERTS}/${DOMAIN}.crt" \
+        "${PROXY_SSL_CERTS}/${DOMAIN}.key"
+    bf-done
+
+else
+
+    bf-echo "Removing SSL certificates and configuration..."
+    bf-rmrf "${PROXY_SSL_CERTS}/*"
+    bf-done
+
+fi
+
+
+#======================================================================================================================
+# Reinitialise SSL.
+#======================================================================================================================
 
 cd ${PROXY_LIB}
 s6-setuidgid www ./init && ./request