diff options
| author | Stefan Fritsch <sf@debian.org> | 2008-02-25 20:21:22 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:36:51 +0100 |
| commit | 120c5089f2bf6b3a3dc44e31274b1694422ffac0 (patch) | |
| tree | 9d9433b83eeeb99c3bc7f4fde48d9a7edb1d1363 | |
| parent | 1db9a2698e23da88eae8578220c4e2552b0b15f7 (diff) | |
| download | apache2-120c5089f2bf6b3a3dc44e31274b1694422ffac0.tar.gz | |
Make bugreport script source /etc/apache2/envvars before calling apache2
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@597 01b336ce-410b-0410-9a02-a0e7f243c266
| -rwxr-xr-x | debian/apache2.2-common.bug.script | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/apache2.2-common.bug.script b/debian/apache2.2-common.bug.script index f3b68ff8..76cb02ef 100755 --- a/debian/apache2.2-common.bug.script +++ b/debian/apache2.2-common.bug.script @@ -6,7 +6,8 @@ $Text::Wrap::columns = 70; open (my $out, ">&=3") or die "could not open FD 3\n"; -my $res = `/usr/sbin/apache2 -t 2>&1`; +my $apache = ". /etc/apache2/envvars && /usr/sbin/apache2"; +my $res = `$apache -t 2>&1`; my @modules; if ($res !~ "Syntax OK") { print $out "Config file syntax check failed.\n"; @@ -15,7 +16,7 @@ if ($res !~ "Syntax OK") { print $out "List of /etc/apache2/mods-enabled/*.load:\n"; } else { - @modules = sort `/usr/sbin/apache2 -M 2>&1`; + @modules = sort `$apache -M 2>&1`; @modules = map { /^ (.*)_module \(shared\)/ ? ($1) : () } @modules; print $out "List of enabled modules from 'apache2 -M':\n"; } diff --git a/debian/changelog b/debian/changelog index bebbb6ec..2a1949bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apache2 (2.2.8-2) UNRELEASED; urgency=low log file. (Closes: #313430) * Print file name where "Useless use of AllowOverride" occured. (Closes: #410334) + * Make bugreport script source /etc/apache2/envvars before calling apache2. -- Stefan Fritsch <sf@debian.org> Fri, 18 Jan 2008 21:12:01 +0100 |