diff options
-rwxr-xr-x | acmeman | 8 | ||||
-rw-r--r-- | lib/App/Acmeman/Source/Apache.pm | 15 |
2 files changed, 19 insertions, 4 deletions
@@ -224,3 +224,3 @@ Use this source if all domains are described in the configuration file. | |||
224 | The B<apache> source module is the default. It scans B<httpd> configuration | 224 | The B<apache> source module is the default. It scans B<httpd> configuration |
225 | files as described in section B<APACHE>. One argument is allowed. If supplied, | 225 | files as described in section B<apache>. One argument is allowed. If supplied, |
226 | it defines the apache configuration layout. Allowed values are: B<debian>, | 226 | it defines the apache configuration layout. Allowed values are: B<debian>, |
@@ -367,3 +367,3 @@ setting. | |||
367 | [core] | 367 | [core] |
368 | source = apache [LAYOUT] | 368 | source = apache [--server-root=DIR] [LAYOUT] |
369 | 369 | ||
@@ -375,2 +375,6 @@ B<rh> (for Red Hat). If not supplied, the layout is determined automatically. | |||
375 | 375 | ||
376 | Use the B<--server-root> option to supply the name of the server root | ||
377 | directory, if for some reason the module is unable to determine it | ||
378 | automatically. | ||
379 | |||
376 | A special directory should be configured for receiving ACME challenges. | 380 | A special directory should be configured for receiving ACME challenges. |
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 | |||
@@ -11,2 +11,3 @@ 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 | ||
@@ -14,3 +15,8 @@ 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 | } |
@@ -240,3 +246,3 @@ sub setup { | |||
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 |
@@ -291,2 +297,7 @@ sub probe { | |||
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 | } |