summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-07-17 08:18:37 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-07-17 08:24:21 (GMT)
commit6cb0e3c6b9c7b148081a707e905635d4cfd963a5 (patch) (side-by-side diff)
tree20abe6cf7bd35d4375e1b16278032bed902ffe69
parentc4e539cf7b31c8938ea471419e42f79a87cfb4ea (diff)
downloadacmeman-6cb0e3c6b9c7b148081a707e905635d4cfd963a5.tar.gz
acmeman-6cb0e3c6b9c7b148081a707e905635d4cfd963a5.tar.bz2
Version 1.06v1.06
* lib/App/Acmeman/Source/Apache.pm (probe): Prefer apachectl over httpd (follow-up from Apache::Defaults) * acmeman: Version 1.06 * Changes: Update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Changes6
-rwxr-xr-xacmeman4
-rw-r--r--lib/App/Acmeman/Source/Apache.pm2
3 files changed, 9 insertions, 3 deletions
diff --git a/Changes b/Changes
index b6662a7..4089093 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+1.06 2018-07-17
+
+* New source: "file"
+* Simplify DNS code
+* Improve detection of Apache default settings
+
1.05 2018-04-17
* null source
diff --git a/acmeman b/acmeman
index 0a51cdb..5a8cf37 100755
--- a/acmeman
+++ b/acmeman
@@ -33,14 +33,14 @@ use Socket qw(inet_ntoa);
use Sys::Hostname;
use Pod::Usage;
use Pod::Man;
-use Getopt::Long qw(:config gnu_getopt no_ignore_case);
+use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_version);
use POSIX qw(strftime time floor);
use App::Acmeman::Config;
use App::Acmeman::Domain qw(:files);
use Data::Dumper;
use Text::ParseWords;
-our $VERSION = '1.05';
+our $VERSION = '1.06';
=head1 NAME
diff --git a/lib/App/Acmeman/Source/Apache.pm b/lib/App/Acmeman/Source/Apache.pm
index c84aea6..2041bb1 100644
--- a/lib/App/Acmeman/Source/Apache.pm
+++ b/lib/App/Acmeman/Source/Apache.pm
@@ -266,7 +266,7 @@ EOT
sub probe {
my ($self, @servlist) = @_;
- @servlist = qw(/usr/sbin/httpd /usr/sbin/apache2)
+ @servlist = qw(/usr/sbin/apachectl /usr/sbin/httpd /usr/sbin/apache2)
unless (@servlist);
open(my $nullout, '>', File::Spec->devnull);
open(my $nullin, '<', File::Spec->devnull);

Return to:

Send suggestions and report system problems to the System administrator.