summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2010-01-16 23:22:50 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:37:06 +0100
commitf204e07b5027422f446e317fb2016ccff52e98a3 (patch)
treedc3a72b88338c264660ba7fd9f5fc44848aff4da
parent46714c867e9bbdd263968d51a2d1825f5122548f (diff)
downloadapache2-f204e07b5027422f446e317fb2016ccff52e98a3.tar.gz
Make bug script also display loaded php extensions
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1120 01b336ce-410b-0410-9a02-a0e7f243c266
-rwxr-xr-xdebian/apache2.2-common.bug-script15
-rw-r--r--debian/changelog1
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/apache2.2-common.bug-script b/debian/apache2.2-common.bug-script
index e7232e2d..96e81f1e 100755
--- a/debian/apache2.2-common.bug-script
+++ b/debian/apache2.2-common.bug-script
@@ -9,6 +9,7 @@ open (my $out, ">&=3") or die "could not open FD 3\n";
my $apache = ". /etc/apache2/envvars && /usr/sbin/apache2";
my $res = `$apache -t 2>&1`;
my @modules;
+my $php;
if ($res !~ "Syntax OK") {
# if we are not root, syntax check will fail because ssl private keys
# are not readable
@@ -33,6 +34,9 @@ else {
$m .= "*";
$missing = 1;
}
+ if ($m =~ /^(php\d)/) {
+ $php = $1;
+ }
}
print $out wrap(" ", " ", "@modules\n");
@@ -43,3 +47,14 @@ else {
"enabled in /etc/apache2/mods-enabled/)\n")
if $missing;
}
+if (defined $php) {
+ my @exts = qx{egrep ^extension= /etc/$php/apache2/php.ini /etc/$php/apache2/conf.d/* 2>/dev/null};
+ if (scalar @exts) {
+ chomp @exts;
+ @exts = grep { ! m{\.dpkg-(?:bak|dist):} } @exts;
+ @exts = sort grep { s{^.*:extension=(\S+)\.\S+}{$1} } @exts;
+ print $out "List of enabled $php extensions:\n";
+ print $out wrap(" ", " ", "@exts\n");
+ }
+}
+
diff --git a/debian/changelog b/debian/changelog
index bac90a02..40b1f1f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apache2 (2.2.14-6) UNRELEASED; urgency=low
* Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
* Add new init script action graceful-stop (LP: #456381)
+ * Make bug script also display php extensions.
-- Stefan Fritsch <sf@debian.org> Sat, 09 Jan 2010 13:11:11 +0100