Commit message (Collapse)AuthorAgeFilesLines
* Don't perform SSL exceptions for MSIE anymore.HEADmasterLars Wendler2018-07-161-5/+0
| | | | Bug:
* init scripts: Replaced non-POSIX compliant "type -p" calls.Tomáš Mózes2018-04-192-4/+4
| | | | Closes:
* 2.4/init/apache2.initd: Start after entropy daemon if available.Lars Wendler2018-03-231-1/+1
| | | | Gentoo-Bug:
* 2.4/scripts/apache2ctl: POSIX shells don't know =~ test operator.Lars Wendler2018-03-231-1/+1
| | | | | | Fixed by using "echo ... | grep -q ..." combination. Gentoo-Bug:
* 2.4/scripts/apache2ctl: Pass commands to the apache daemon.Lars Wendler2018-03-151-1/+24
| | | | | | | Gentoo-Bug: Thanks-to: Joona Hoikkala <> Thanks-to: Andrey Falko <>
* Added 41_mod_http2.conf to apache-2.4 modules.d directory.Lars Wendler2016-12-301-0/+9
* Whitespace fixes.Lars Wendler2016-03-031-2/+2
| | | | Signed-off-by: Lars Wendler <>
* apache2.initd: set defaults for LYNX and STATUSURL once.Michael Orlitzky2016-03-031-4/+2
| | | | | | | | The default values for the LYNX and STATUSURL variables were set in functions. Now that the other conf.d defaults are set at the beginning of the script, it makes sense to set these there, too. The LYNX default was set twice, in configdump() and fullstatus(), so this eliminates some duplication.
* apache2.initd: replace deprecated name "runscript" with "openrc-run".Michael Orlitzky2016-03-031-1/+1
* apache2.initd: append SERVERROOT and CONFIGFILE to APACHE2_OPTS once.Michael Orlitzky2016-03-031-3/+5
| | | | | | | | | | | We are currently appending both SERVERROOT and CONFIGFILE to APACHE2_OPTS in the checkconfd() function. Since checkconfd() is called multiple times, this can lead to duplication of command-line arguments as witnessed in bug 566726. Since the values of SERVERROOT and CONFIGFILE are fixed, we now instead append them once at the beginning of the script. Gentoo-Bug: 566726
* apache2.initd: append STARTUPERRORLOG to APACHE2_OPTS in start().Michael Orlitzky2016-03-031-2/+7
| | | | | | | | | | We currently append the value of STARTUPERRORLOG to APACHE2_OPTS in the checkconfd() function. This can cause duplication of command-line arguments as witnessed in bug 566726. Since STARTUPERRORLOG does need conditional handling (we don't append it if it's empty), the wisest place to do so seems to be in start(). Gentoo-Bug: 566726
* apache2.initd: do not call checkconfd() before stopping.Michael Orlitzky2016-03-031-2/+0
| | | | | | If we are attempting to stop (but not restart) apache2, then there is no reason to check whether or not $SERVERROOT exists -- we should stop apache2 either way. So remove that call to checkconfd().
* apache2.initd: set the path to the apache2 binary once, globally.Michael Orlitzky2016-03-031-1/+3
| | | | | | | The $APACHE2 variable (containing the path to apache2) is currently set every time checkconfd() is called. Its value never changes, and the variable is already global, so we might as well set it once at the beginning of the script.
* apache2.initd: apply default values for conf.d variables in one place.Michael Orlitzky2016-03-031-8/+7
| | | | | | | | There are a few variables in the apache2 conf.d file that have default values. The default values were applied at various places in different commands, and often more than once. Since none of those variables need to be modified after the script has loaded, it makes more sense to set them once at the beginning of the script.
* apache2.initd: remove config file readability check.Michael Orlitzky2016-03-031-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | In checkconfd(), the apache2 init script checks to make sure that $CONFIGFILE is readable. To do this, it needs to reimplement the relative path handling that apache2 already does. If we remove the relative path handling from checkconfd(), then apache2 continues to do the right thing when $CONFIGFILE is relative. However, our custom readability check fails, since it is looking for an absolute path that doesn't exist. Fortunately, apache2 already checks to ensure that the configuration file exists and is readable. If we remove the custom readability check entirely, then we get an error like, * apache2 has detected an error in your setup: apache2: Could not open configuration file /usr/lib/apache2/example.conf: No such file or directory This is not sufficiently worse than the custom error: Unable to read configuration file: example.conf Therefore the custom readability check is removed in this commit, and we can avoid reimplementing the relative path handling as well.
* apache2.initd: update copyright year to 2016.Michael Orlitzky2016-03-031-1/+1
* apache2.initd: remove ancient baselayout-1.x check in checkconfd().Michael Orlitzky2016-03-031-6/+0
| | | | | OpenRC went stable on 2011-06-28, and support for baselayout-1.x died off after that. It's been ~4.5 years, so I think this check can go.
* apache2.initd: capture config test output in checkconfig().Michael Orlitzky2016-03-031-2/+2
| | | | | | | | | The configtest() command in the init script calls "apache2 -t" to test the configuration for syntax errors. Before this commit, the command was run twice -- once to see if there was an error, and once to output the error to the user. We can capture the output in a variable the first time; this commit does so, and prints the contents of that variable when there is an error.
* Removed security patches which went into apache-2.2.28.Lars Wendler2014-09-223-611/+0
* Move itk patch behind peruser patchLars Wendler2014-07-311-0/+0
* Added several security fixes (CVE-2014-0118, CVE-2014-0226 and CVE-2014-0231)Lars Wendler2014-07-314-1/+612
* Removed obsolete patch for CVE-2011-3368 (bug #511656).Lars Wendler2014-05-282-68/+0
* Removed comment about deprecated AddDirectoryIndex option as per request in ↵Lars Wendler2014-05-242-4/+2
| | | | bug #403439.
* Renamed MaxRequestsPerChild to MaxConnectionsPerChild as per bug #511136.Lars Wendler2014-05-241-7/+7
* Fixed references to online manual in apache-2.4 config files.Lars Wendler2014-05-244-6/+6
* Moved closing IfDefine directive to the right place.Lars Wendler2014-05-222-2/+2
* Added some module dependencies to 00_apache_manual.confLars Wendler2014-05-222-1/+9
* Wrap some IfDefine around 00_mod_autoindex.conf so people can disable it ↵Lars Wendler2014-05-222-0/+6
| | | | (bug #493020).
* Revert runtime dir location changes as /run only exists on Linux systemsLars Wendler2014-05-226-6/+6
* Attempt to fix stop of apache with mod_perl in apache-2.2 as well (bug #503986)Lars Wendler2014-05-141-1/+1
* Attempt to fix stop of apache with mod_perl (bug #503986)Lars Wendler2014-05-141-1/+1
* Replaced some bad host directives (bug #509772)Lars Wendler2014-05-073-3/+3
* Move SSLCompression into the IfDefineLars Wendler2014-04-212-2/+2
* Change GENTOO_PATCHNAME in ebuild as wellLars Wendler2014-04-201-6/+9
* Modifications to support GIT instead of SVNLars Wendler2014-04-201-14/+13
* Disabled SSLCompression by default (bug #507324). Replaced old weak with ↵Lars Wendler2014-04-204-2/+34
| | | | strong ciphers (bug #506924).
* Fixed startup of init scriptsLars Wendler2013-11-222-8/+16
* Added files for apache-2.4Lars Wendler2013-11-0933-0/+2200
* Fix runtimedir as well.Lars Wendler2013-11-091-1/+1
* Fixed location of pidfile.Lars Wendler2013-11-092-2/+2
* apache2.initd: Init script now returns as failed when apache fails to start.Lars Wendler2013-11-091-5/+7
| | | | Signed-off-by: Lars Wendler <>
* Update default to better match upstream intentions, thank Steve Dibb for ↵Peter Volkov2011-10-181-2/+22
| | | | report in bug #387157.
* Patch to fix Reverse Proxy Mode Security Bypass (CVE-2011-3368).Peter Volkov2011-10-181-0/+34
* Use extra_{,started}commands, bug #385637 by Martin von Gagern. Check config ↵Peter Volkov2011-10-181-30/+32
| | | | during restart, bug #384997 wrt Christian Ruppert (idl0r). Don't use pidof to check for running instances to make it more ConTainer friendly, bug #384267 by Stef Simoens. Drop ssl_scache check as the problem it workarounds was fixed upstream years ago: . Dropped '# zap!' in gracefulstop.
* Don't install craft into /etc/apache2, bug 382997 wrt Remy BlankPeter Volkov2011-09-151-9/+0
* Use start-stop-daemon to use system limits for apache. Fixes bug #347301 by ↵Peter Volkov2011-09-151-2/+2
| | | | Diego Elio Pettenò.
* Prepare 2.2.20: update init script to respect return status of stop, bug ↵Peter Volkov2011-09-014-78/+128
| | | | #357585 wrt Robert Trace; update itk patch, thank Denis Kaganovich for report in bug 368743#c2.
* fix bugs in init scripts and include latest peruser patchBenedikt Boehm2011-02-183-1595/+1721
* Add patch for APXS to respect LDFLAGS, see bug #335405.Krzysztof Pawlik2010-09-011-0/+13
* dump peruser to 0.4.0-rc1 wrt #294098Benedikt Boehm2010-09-011-173/+367