[boinc] 01/04: Adjusting Apache PID file location

[Steffen Möller]

This is an automated email from the git hooks/post-receive script.

moeller pushed a commit to branch master
in repository boinc.

commit fe219f7204009523b24d85f29bd0aa74df698d31
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu Nov 7 15:01:35 2013 +0100

    Adjusting Apache PID file location
---
 debian/patches/series                  |    1 +
 debian/patches/server_status_php.patch |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 0a26b0d..ace74e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -74,3 +74,4 @@ addressing_addional_html_dirs.patch
 gui_urls_xml_added_to_Makefile.patch
 file_upload_handler_in_sched_linking.patch
 disable_silent_rules.patch
+server_status_php.patch
diff --git a/debian/patches/server_status_php.patch b/debian/patches/server_status_php.patch
new file mode 100644
index 0000000..09e5574
--- /dev/null
+++ b/debian/patches/server_status_php.patch
@@ -0,0 +1,18 @@
+Index: boinc/html/user/server_status.php
+===================================================================
+--- boinc.orig/html/user/server_status.php
++++ boinc/html/user/server_status.php
+@@ -207,7 +207,12 @@
+ }
+ $uldl_pid = parse_element($config_vars,"<uldl_pid>");
+ if ($uldl_pid == "") {
+-    $uldl_pid = "/etc/httpd/run/httpd.pid";
++    foreach (array("/etc/httpd/run/httpd.pid","/var/run/apache2/apache2.pid") as $f) {
++        if (file_exists($f)) {
++          $uldl_pid = $f
++	  break;
++	}
++    }
+ }
+ $uldl_host = parse_element($config_vars,"<uldl_host>");
+ if ($uldl_host == "") {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git