diff options
Diffstat (limited to 'lib/App/Acmeman/Source/Apache.pm')
-rw-r--r-- | lib/App/Acmeman/Source/Apache.pm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/App/Acmeman/Source/Apache.pm b/lib/App/Acmeman/Source/Apache.pm index 2041bb1..b429f89 100644 --- a/lib/App/Acmeman/Source/Apache.pm +++ b/lib/App/Acmeman/Source/Apache.pm | |||
@@ -9,10 +9,16 @@ use File::Spec; | |||
9 | use IPC::Open3; | 9 | use IPC::Open3; |
10 | use App::Acmeman::Apache::Layout; | 10 | use App::Acmeman::Apache::Layout; |
11 | use parent 'App::Acmeman::Source'; | 11 | use parent 'App::Acmeman::Source'; |
12 | use Getopt::Long qw(GetOptionsFromArray :config gnu_getopt no_ignore_case); | ||
12 | 13 | ||
13 | sub new { | 14 | sub new { |
14 | my $class = shift; | 15 | my $class = shift; |
15 | bless { _layout => new App::Acmeman::Apache::Layout(@_) }, $class; | 16 | my $server_root; |
17 | GetOptionsFromArray(\@_, | ||
18 | 'server-root=s' => \$server_root); | ||
19 | my $self = bless { _layout => new App::Acmeman::Apache::Layout(@_) }, $class; | ||
20 | $self->server_root($server_root) if $server_root; | ||
21 | return $self; | ||
16 | } | 22 | } |
17 | 23 | ||
18 | sub layout { shift->{_layout} } | 24 | sub layout { shift->{_layout} } |
@@ -238,7 +244,7 @@ sub setup { | |||
238 | SSLEngine on | 244 | SSLEngine on |
239 | SSLProtocol all -SSLv2 -SSLv3 | 245 | SSLProtocol all -SSLv2 -SSLv3 |
240 | SSLHonorCipherOrder on | 246 | SSLHonorCipherOrder on |
241 | SSLCipherSuite EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:EECDH+RC4:RSA+RC4:!MD5 | 247 | SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:!DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA |
242 | SSLCertificateFile /etc/ssl/acme/\$domain/cert.pem | 248 | SSLCertificateFile /etc/ssl/acme/\$domain/cert.pem |
243 | SSLCertificateKeyFile /etc/ssl/acme/\$domain/privkey.pem | 249 | SSLCertificateKeyFile /etc/ssl/acme/\$domain/privkey.pem |
244 | SSLCACertificateFile /etc/ssl/acme/lets-encrypt-x3-cross-signed.pem | 250 | SSLCACertificateFile /etc/ssl/acme/lets-encrypt-x3-cross-signed.pem |
@@ -289,6 +295,11 @@ sub probe { | |||
289 | } | 295 | } |
290 | close $nullin; | 296 | close $nullin; |
291 | close $nullout; | 297 | close $nullout; |
298 | unless ($self->server_root) { | ||
299 | ::error("can't deduce server root directory"); | ||
300 | ::error("use `source = apache --server-root=DIR' in [core] section of /etc/acmeman.conf to declare it"); | ||
301 | exit(1); | ||
302 | } | ||
292 | } | 303 | } |
293 | 304 | ||
294 | 305 | ||