diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-07 23:00:59 -0300 |
| commit | 87bd9124ec1abd5c6171af47af93805b975343b6 (patch) | |
| tree | f9732aabf9c46c6391409187f8ddf8cc5b005006 /staging/apache/apachectl-confd.patch | |
| parent | 96c65d8a0393645808ab5ea31776baa26209fc5f (diff) | |
| parent | 0dee03071a0643c3ee5820afa3c694dcef71d385 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/beye/PKGBUILD
community/xmlrpc-c/PKGBUILD
extra/avidemux/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk2/PKGBUILD
extra/libvpx/PKGBUILD
extra/libxfce4menu/PKGBUILD
extra/libxml2/PKGBUILD
extra/pixman/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/thunar-volman/PKGBUILD
extra/vdpau-video/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
extra/xfce4-cpufreq-plugin/PKGBUILD
extra/xfce4-cpugraph-plugin/PKGBUILD
extra/xfce4-dict/PKGBUILD
extra/xfce4-diskperf-plugin/PKGBUILD
extra/xfce4-eyes-plugin/PKGBUILD
extra/xfce4-fsguard-plugin/PKGBUILD
extra/xfce4-mixer/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-power-manager/PKGBUILD
extra/xfce4-systemload-plugin/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xfce4-time-out-plugin/PKGBUILD
extra/xfce4-timer-plugin/PKGBUILD
extra/xfce4-wavelan-plugin/PKGBUILD
extra/xorg-luit/PKGBUILD
extra/xorg-xfontsel/PKGBUILD
extra/xulrunner/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'staging/apache/apachectl-confd.patch')
| -rw-r--r-- | staging/apache/apachectl-confd.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/staging/apache/apachectl-confd.patch b/staging/apache/apachectl-confd.patch new file mode 100644 index 000000000..d0f4b699e --- /dev/null +++ b/staging/apache/apachectl-confd.patch @@ -0,0 +1,15 @@ +--- support/apachectl.in.orig 2010-03-06 18:09:11.000000000 +0100 ++++ support/apachectl.in 2010-03-06 18:12:31.000000000 +0100 +@@ -56,6 +56,12 @@ + # the URL to your server's mod_status status page. If you do not + # have one, then status and fullstatus will not work. + STATUSURL="http://localhost:@PORT@/server-status" ++ ++# Source /etc/conf.d/apache for $HTTPD setting, etc. ++if [ -r /etc/conf.d/apache ]; then ++ . /etc/conf.d/apache ++fi ++ + # + # Set this variable to a command that increases the maximum + # number of file descriptors allowed per child process. This is |