Fix config generation

Packaging ready

diff --git a/acme.pm b/Acme.pm
similarity index 100%
rename from acme.pm
rename to Acme.pm

diff --git a/letscert b/letscert
index dbf245e0184be54a7d375068abdaca52780fa75f..7c843c6e123bff50614dd3b1e375423be7f0a1e5 100755 (executable)
--- a/letscert
+++ b/letscert
@@ -19,8 +19,8 @@
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-# Load acme
-use acme;
+# Load Acme
+use Acme;

 
 # Load POSIX
 use POSIX qw(EXIT_SUCCESS EXIT_FAILURE);
 
 # Load POSIX
 use POSIX qw(EXIT_SUCCESS EXIT_FAILURE);

diff --git a/letscron b/letscron
index e315a420f8e0610a9b154fce8c198cc3f20a77e4..9a9635503422d0efa381415f2e9f7c5a09f35281 100755 (executable)
--- a/letscron
+++ b/letscron
@@ -31,7 +31,7 @@ use File::Spec;
 use File::Slurp qw(read_file write_file);
 use JSON qw(decode_json);
 use IPC::System::Simple qw(capturex $EXITVAL);
 use File::Slurp qw(read_file write_file);
 use JSON qw(decode_json);
 use IPC::System::Simple qw(capturex $EXITVAL);

-use acme qw(CERT_DIR CONFIG DS KEY_DIR SERVER_CRT SERVER_KEY);
+use Acme qw(CERT_DIR CONFIG DS KEY_DIR SERVER_CRT SERVER_KEY);

 
 # Load POSIX
 use POSIX qw(strftime EXIT_SUCCESS EXIT_FAILURE);
 
 # Load POSIX
 use POSIX qw(strftime EXIT_SUCCESS EXIT_FAILURE);


@@ -69,7 +69,7 @@ unless (
                ! scalar map {unless(defined($_->{cert}) && defined($_->{key}) && defined($_->{mail}) && defined($_->{domain}) && defined($_->{domains})) {1;} else {();}} @{$config->{certificates}}
        }
 ) {
                ! scalar map {unless(defined($_->{cert}) && defined($_->{key}) && defined($_->{mail}) && defined($_->{domain}) && defined($_->{domains})) {1;} else {();}} @{$config->{certificates}}
        }
 ) {

-       print 'Config file '.CONFIG.' is invalid'."\n";
+       print 'Config file '.CONFIG.' is not readable or invalid'."\n";

        exit EXIT_FAILURE;
 }
 
        exit EXIT_FAILURE;
 }