smeserver-letsencrypt/contribs10/smeserver-letsencrypt-fix-hook-entry.patch

diff -ruN smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/dehydrated/config/10Default smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/dehydrated/config/10Default
--- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/dehydrated/config/10Default    2020-01-17 11:54:35.903578792 +0100
+++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/dehydrated/config/10Default        2020-01-17 12:48:44.752482453 +0100
@@ -15,35 +15,44 @@
 
     $OUT .= "#!/bin/bash\n";
 
-    $OUT .= "WELLKNOWN=\"/home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge\"\n";
-
-    if ( $letsencryptStatus eq 'test' ) {
+    if ( $letsencryptStatus eq 'disabled' ) {
+        $OUT .= "letsencrypt is disabled";
+    }
+    else {
+        # We should only be here if we are not disabled
+        if ( $letsencryptStatus eq 'test' ) {
 
-        # Use staging directory for testing
-        # Once you are sure you have the settings right then change
+            # Use staging directory for testing
+            # Once you are sure you have the settings right then change
 
-        # If it's v1 then use v1, if v2 or auto then use v2 staging
-        if ( $letsencryptAPI eq '1' ) {
-            $OUT .= "CA=\"https://acme-staging.api.letsencrypt.org/directory\"\n";
+            # If it's v1 then use v1, if v2 or auto then use v2 staging
+            if ( $letsencryptAPI eq '1' ) {
+                $OUT .= "CA=\"https://acme-staging.api.letsencrypt.org/directory\"\n";
+            }
+            elsif ( ( $letsencryptAPI eq '2' ) || ( $letsencryptAPI eq 'auto' ) ) {
+                $OUT .= "CA=\"https://acme-staging-v02.api.letsencrypt.org/directory\"\n";
+            }
         }
-        elsif (( $letsencryptAPI eq '2' ) || ( $letsencryptAPI eq 'auto' )) {
-            $OUT .= "CA=\"https://acme-staging-v02.api.letsencrypt.org/directory\"\n";
-        }
-    }
 
-    elsif ( $letsencryptStatus ne 'test' ) {
+        elsif ( $letsencryptStatus ne 'test' ) {
 
-        # Real server - default setting in the the main file
-        # Only use this once you are sure things are OK or you will hit a rate limit.
+            # Real server - default settings are in the the main dehydrated file
+            # Only use this once you are sure things are OK or you will hit a rate limit.
 
-        # If it's v1 then use v1, if v2 then v2, if auto accept the defaults in the main file
-        if ( $letsencryptAPI eq '1' ) {
-            $OUT .= "CA=\"https://acme-v01.api.letsencrypt.org/directory\"\n";
-        }
-        elsif ( $letsencryptAPI eq '2' ) {
-            $OUT .= "CA=\"https://acme-v02.api.letsencrypt.org/directory\"\n";
+            # If it's v1 then use v1, if v2 then v2, if auto accept the defaults in the main file
+            if ( $letsencryptAPI eq '1' ) {
+                $OUT .= "CA=\"https://acme-v01.api.letsencrypt.org/directory\"\n";
+            }
+            elsif ( $letsencryptAPI eq '2' ) {
+                $OUT .= "CA=\"https://acme-v02.api.letsencrypt.org/directory\"\n";
+            }
         }
 
+        $OUT .= "WELLKNOWN=\"/home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge\"\n";
+
+        # Hook Script always enabled
+        $OUT .= "HOOK=\"/usr/bin/hook-script.sh\"\n";
+
         # Base directory for account key, generated certificates and list of domains (default: $SCRIPTDIR -- uses config directory if undefined)
         #BASEDIR=$SCRIPTDIR
 
@@ -67,11 +76,7 @@
             $OUT .= "CONTACT_EMAIL=$letsencryptEmail\n";
         }
 
-        # Hook Script always enabled
-        $OUT .= "HOOK=\"/usr/bin/hook-script.sh\"\n";
-
         # API version - auto | 1 | 2
-
         if ( $letsencryptAPI eq '1' ) {
             $OUT .= "API=\"1\"\n";
         }
@@ -81,6 +86,5 @@
         else {
             $OUT .= "API=\"auto\"\n";
         }
-
     }
 }
1	brianr	1.1	diff -ruN smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/dehydrated/config/10Default smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/dehydrated/config/10Default
2			--- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/dehydrated/config/10Default 2020-01-17 11:54:35.903578792 +0100
3			+++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/dehydrated/config/10Default 2020-01-17 12:48:44.752482453 +0100
4			@@ -15,35 +15,44 @@
5
6			$OUT .= "#!/bin/bash\n";
7
8			- $OUT .= "WELLKNOWN=\"/home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge\"\n";
9			-
10			- if ( $letsencryptStatus eq 'test' ) {
11			+ if ( $letsencryptStatus eq 'disabled' ) {
12			+ $OUT .= "letsencrypt is disabled";
13			+ }
14			+ else {
15			+ # We should only be here if we are not disabled
16			+ if ( $letsencryptStatus eq 'test' ) {
17
18			- # Use staging directory for testing
19			- # Once you are sure you have the settings right then change
20			+ # Use staging directory for testing
21			+ # Once you are sure you have the settings right then change
22
23			- # If it's v1 then use v1, if v2 or auto then use v2 staging
24			- if ( $letsencryptAPI eq '1' ) {
25			- $OUT .= "CA=\"https://acme-staging.api.letsencrypt.org/directory\"\n";
26			+ # If it's v1 then use v1, if v2 or auto then use v2 staging
27			+ if ( $letsencryptAPI eq '1' ) {
28			+ $OUT .= "CA=\"https://acme-staging.api.letsencrypt.org/directory\"\n";
29			+ }
30			+ elsif ( ( $letsencryptAPI eq '2' ) \|\| ( $letsencryptAPI eq 'auto' ) ) {
31			+ $OUT .= "CA=\"https://acme-staging-v02.api.letsencrypt.org/directory\"\n";
32			+ }
33			}
34			- elsif (( $letsencryptAPI eq '2' ) \|\| ( $letsencryptAPI eq 'auto' )) {
35			- $OUT .= "CA=\"https://acme-staging-v02.api.letsencrypt.org/directory\"\n";
36			- }
37			- }
38
39			- elsif ( $letsencryptStatus ne 'test' ) {
40			+ elsif ( $letsencryptStatus ne 'test' ) {
41
42			- # Real server - default setting in the the main file
43			- # Only use this once you are sure things are OK or you will hit a rate limit.
44			+ # Real server - default settings are in the the main dehydrated file
45			+ # Only use this once you are sure things are OK or you will hit a rate limit.
46
47			- # If it's v1 then use v1, if v2 then v2, if auto accept the defaults in the main file
48			- if ( $letsencryptAPI eq '1' ) {
49			- $OUT .= "CA=\"https://acme-v01.api.letsencrypt.org/directory\"\n";
50			- }
51			- elsif ( $letsencryptAPI eq '2' ) {
52			- $OUT .= "CA=\"https://acme-v02.api.letsencrypt.org/directory\"\n";
53			+ # If it's v1 then use v1, if v2 then v2, if auto accept the defaults in the main file
54			+ if ( $letsencryptAPI eq '1' ) {
55			+ $OUT .= "CA=\"https://acme-v01.api.letsencrypt.org/directory\"\n";
56			+ }
57			+ elsif ( $letsencryptAPI eq '2' ) {
58			+ $OUT .= "CA=\"https://acme-v02.api.letsencrypt.org/directory\"\n";
59			+ }
60			}
61
62			+ $OUT .= "WELLKNOWN=\"/home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge\"\n";
63			+
64			+ # Hook Script always enabled
65			+ $OUT .= "HOOK=\"/usr/bin/hook-script.sh\"\n";
66			+
67			# Base directory for account key, generated certificates and list of domains (default: $SCRIPTDIR -- uses config directory if undefined)
68			#BASEDIR=$SCRIPTDIR
69
70			@@ -67,11 +76,7 @@
71			$OUT .= "CONTACT_EMAIL=$letsencryptEmail\n";
72			}
73
74			- # Hook Script always enabled
75			- $OUT .= "HOOK=\"/usr/bin/hook-script.sh\"\n";
76			-
77			# API version - auto \| 1 \| 2
78			-
79			if ( $letsencryptAPI eq '1' ) {
80			$OUT .= "API=\"1\"\n";
81			}
82			@@ -81,6 +86,5 @@
83			else {
84			$OUT .= "API=\"auto\"\n";
85			}
86			-
87			}
88			}