1 |
brianr |
1.1 |
diff -ruN smeserver-letsencrypt-0.5.old/createlinks smeserver-letsencrypt-0.5/createlinks |
2 |
|
|
--- smeserver-letsencrypt-0.5.old/createlinks 2020-01-17 13:40:46.704060484 +0100 |
3 |
|
|
+++ smeserver-letsencrypt-0.5/createlinks 2020-01-17 16:13:05.038550408 +0100 |
4 |
|
|
@@ -25,7 +25,7 @@ |
5 |
|
|
} |
6 |
|
|
|
7 |
|
|
foreach (qw( |
8 |
|
|
- /etc/cron.daily/letsencrypt |
9 |
|
|
+ /etc/cron.d/dehydrated |
10 |
|
|
)) |
11 |
|
|
{ |
12 |
|
|
templates2events("$_", qw( |
13 |
|
|
diff -ruN smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/cron.d/dehydrated/10dehydrated smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/cron.d/dehydrated/10dehydrated |
14 |
|
|
--- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/cron.d/dehydrated/10dehydrated 1970-01-01 01:00:00.000000000 +0100 |
15 |
|
|
+++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/cron.d/dehydrated/10dehydrated 2020-01-17 16:13:05.038550408 +0100 |
16 |
|
|
@@ -0,0 +1,20 @@ |
17 |
|
|
+{ |
18 |
|
|
+ use strict; |
19 |
|
|
+ use warnings; |
20 |
|
|
+ use esmith::ConfigDB; |
21 |
|
|
+ |
22 |
|
|
+ my $configDB = esmith::ConfigDB->open_ro or die("can't open Config DB"); |
23 |
|
|
+ |
24 |
|
|
+ my $letsencryptStatus = $configDB->get_prop( 'letsencrypt', 'status' ) || 'disabled'; |
25 |
|
|
+ |
26 |
|
|
+ if ( $letsencryptStatus eq 'enabled' ) { |
27 |
|
|
+ |
28 |
|
|
+ $OUT .= "#!/bin/sh\n\n"; |
29 |
|
|
+ $OUT .= "32 3 * * 5 root test -s /etc/dehydrated/domains.txt && /usr/bin/dehydrated --cron"; |
30 |
|
|
+ } |
31 |
|
|
+ |
32 |
|
|
+ else { |
33 |
|
|
+ $OUT .= "# letsencrypt is disabled\n"; |
34 |
|
|
+ } |
35 |
|
|
+} |
36 |
|
|
+ |
37 |
|
|
diff -ruN smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/cron.daily/letsencrypt/10letsencrypt smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/cron.daily/letsencrypt/10letsencrypt |
38 |
|
|
--- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/cron.daily/letsencrypt/10letsencrypt 2020-01-17 13:40:46.703060435 +0100 |
39 |
|
|
+++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/cron.daily/letsencrypt/10letsencrypt 1970-01-01 01:00:00.000000000 +0100 |
40 |
|
|
@@ -1,20 +0,0 @@ |
41 |
|
|
-{ |
42 |
|
|
- use strict; |
43 |
|
|
- use warnings; |
44 |
|
|
- use esmith::ConfigDB; |
45 |
|
|
- |
46 |
|
|
- my $configDB = esmith::ConfigDB->open_ro or die("can't open Config DB"); |
47 |
|
|
- |
48 |
|
|
- my $letsencryptStatus = $configDB->get_prop( 'letsencrypt', 'status' ) || 'disabled'; |
49 |
|
|
- |
50 |
|
|
- if ( $letsencryptStatus eq 'enabled' ) { |
51 |
|
|
- |
52 |
|
|
- $OUT .= "#!/bin/sh\n\n"; |
53 |
|
|
- $OUT .= "/usr/bin/dehydrated -c 2>&1 | logger -t dehydrated"; |
54 |
|
|
- } |
55 |
|
|
- |
56 |
|
|
- else { |
57 |
|
|
- $OUT .= "# letsencrypt is disabled\n"; |
58 |
|
|
- } |
59 |
|
|
-} |
60 |
|
|
- |
61 |
|
|
diff -ruN smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates.metadata/etc/cron.d/dehydrated smeserver-letsencrypt-0.5/root/etc/e-smith/templates.metadata/etc/cron.d/dehydrated |
62 |
|
|
--- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates.metadata/etc/cron.d/dehydrated 1970-01-01 01:00:00.000000000 +0100 |
63 |
|
|
+++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates.metadata/etc/cron.d/dehydrated 2020-01-17 16:13:05.039550457 +0100 |
64 |
|
|
@@ -0,0 +1 @@ |
65 |
|
|
+PERMS=0644 |
66 |
|
|
diff -ruN smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates.metadata/etc/cron.daily/letsencrypt smeserver-letsencrypt-0.5/root/etc/e-smith/templates.metadata/etc/cron.daily/letsencrypt |
67 |
|
|
--- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates.metadata/etc/cron.daily/letsencrypt 2020-01-17 13:40:46.702060384 +0100 |
68 |
|
|
+++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates.metadata/etc/cron.daily/letsencrypt 1970-01-01 01:00:00.000000000 +0100 |
69 |
|
|
@@ -1 +0,0 @@ |
70 |
|
|
-PERMS=0755 |