diff -ruN smeserver-letsencrypt-0.5.old/createlinks smeserver-letsencrypt-0.5/createlinks --- smeserver-letsencrypt-0.5.old/createlinks 2020-01-17 13:40:46.704060484 +0100 +++ smeserver-letsencrypt-0.5/createlinks 2020-01-17 16:13:05.038550408 +0100 @@ -25,7 +25,7 @@ } foreach (qw( - /etc/cron.daily/letsencrypt + /etc/cron.d/dehydrated )) { templates2events("$_", qw( 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 --- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/cron.d/dehydrated/10dehydrated 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/cron.d/dehydrated/10dehydrated 2020-01-17 16:13:05.038550408 +0100 @@ -0,0 +1,20 @@ +{ + use strict; + use warnings; + use esmith::ConfigDB; + + my $configDB = esmith::ConfigDB->open_ro or die("can't open Config DB"); + + my $letsencryptStatus = $configDB->get_prop( 'letsencrypt', 'status' ) || 'disabled'; + + if ( $letsencryptStatus eq 'enabled' ) { + + $OUT .= "#!/bin/sh\n\n"; + $OUT .= "32 3 * * 5 root test -s /etc/dehydrated/domains.txt && /usr/bin/dehydrated --cron"; + } + + else { + $OUT .= "# letsencrypt is disabled\n"; + } +} + 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 --- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates/etc/cron.daily/letsencrypt/10letsencrypt 2020-01-17 13:40:46.703060435 +0100 +++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates/etc/cron.daily/letsencrypt/10letsencrypt 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -{ - use strict; - use warnings; - use esmith::ConfigDB; - - my $configDB = esmith::ConfigDB->open_ro or die("can't open Config DB"); - - my $letsencryptStatus = $configDB->get_prop( 'letsencrypt', 'status' ) || 'disabled'; - - if ( $letsencryptStatus eq 'enabled' ) { - - $OUT .= "#!/bin/sh\n\n"; - $OUT .= "/usr/bin/dehydrated -c 2>&1 | logger -t dehydrated"; - } - - else { - $OUT .= "# letsencrypt is disabled\n"; - } -} - 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 --- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates.metadata/etc/cron.d/dehydrated 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates.metadata/etc/cron.d/dehydrated 2020-01-17 16:13:05.039550457 +0100 @@ -0,0 +1 @@ +PERMS=0644 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 --- smeserver-letsencrypt-0.5.old/root/etc/e-smith/templates.metadata/etc/cron.daily/letsencrypt 2020-01-17 13:40:46.702060384 +0100 +++ smeserver-letsencrypt-0.5/root/etc/e-smith/templates.metadata/etc/cron.daily/letsencrypt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -PERMS=0755