| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Remove patches that are already included in the 2.5.60 release.
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
|
|
| |
Both these patches are already fixed upstream and should be included
in 2.5.60 when it is released.
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
|
| |
https://bugs.gentoo.org/925310
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/916043
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
|
|
| |
This patch was taken from upstream and has been released in apache
2.0.48.
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/860081
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/906523
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/858836
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/844868
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
|
|
| |
These URLs are only for display purposes, but still more sensible to
show https URLs.
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix two issues with the interface binding check:
1) don't special case ports 80 and 443 since the interface requirement
also applies to all other ports.
2) on show the warning for non-generic binds (i.e. binding a specific
IP address) since that requires the associated interface to be up
first.
Bug: https://bugs.gentoo.org/913227
Bug: https://github.com/gentoo/gentoo/pull/32529
Signed-off-by: Jaco Kroon <jaco@uls.co.za>
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
|
|
|
|
| |
Only enable TLSv1.2+, update cipher suite to only include strong
ciphers, turn off ordering preference to allow clients to use the best
cipher for them.
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/646032
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
| |
Reported-by: Hank Leininger <hlein@korelogic.com>
Bug: https://bugs.gentoo.org/762481
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
|
| |
This reverts commit d8466105dfb6f3323561445488afa300634013b0
because of unresolved issues
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
|
| |
Code blatantly stolen from net-misc/openssh init script
Bug: https://bugs.gentoo.org/482092
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
| |
instead of bzip2 compressed ones
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Attempt to keep the script POSIX sh compliant
- Don't use "function" prefix
- Use curly braces for variables
- Fixed indentation
- Put code for systemd into an "else" part
- Renamed "ERROR" variable to "retval"
- Made some variables local
- Put the systemd apache2 service file reference into a variable
Bug: https://bugs.gentoo.org/673530
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
| |
Thanks-to: Freenode IRC-user "omelius"
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
| |
Bug: https://bugs.gentoo.org/676990
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
| |
Bug: https://bugs.gentoo.org/604744
|
|
|
|
| |
Closes: https://bugs.gentoo.org/635400
|
|
|
|
| |
Gentoo-Bug: https://bugs.gentoo.org/470018
|
|
|
|
|
|
| |
Fixed by using "echo ... | grep -q ..." combination.
Gentoo-Bug: https://bugs.gentoo.org/650678
|
|
|
|
|
|
|
| |
Gentoo-Bug: https://bugs.gentoo.org/634414
Thanks-to: Joona Hoikkala <joona@kuori.org>
Thanks-to: Andrey Falko <Ma3oxuct@gmail.com>
|
| |
|
|
|
|
| |
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
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().
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|