git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
14999b7
)
the apache 2.2/2.4 compat layer was broken because of apachectl not behaving like...
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 9 Apr 2019 13:34:49 +0000
(15:34 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 9 Apr 2019 13:34:49 +0000
(15:34 +0200)
plc.d/functions
patch
|
blob
|
history
diff --git
a/plc.d/functions
b/plc.d/functions
index
161da9e
..
340e89d
100644
(file)
--- a/
plc.d/functions
+++ b/
plc.d/functions
@@
-171,7
+171,9
@@
function plc_reload () {
# </Directory>
function apache_newauth () {
# </Directory>
function apache_newauth () {
- apache_version=$(apachectl -V 2> /dev/null | grep 'Server version' | cut -d ' ' -f3 | sed -e 's,^.*/,,')
+ # somehow in 2019 apachectl stopped answering the -V option
+ # apache_version=$(apachectl -V 2> /dev/null | grep 'Server version' | cut -d ' ' -f3 | sed -e 's,^.*/,,')
+ apache_version=$(rpm -q --queryformat "%{VERSION}" httpd)
apache_major=$(echo $apache_version | cut -d. -f1)
apache_minor=$(echo $apache_version | cut -d. -f2)
test "$apache_minor" -ge 4
apache_major=$(echo $apache_version | cut -d. -f1)
apache_minor=$(echo $apache_version | cut -d. -f2)
test "$apache_minor" -ge 4