rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- apachectl: restore -V/-v/-t support (#1727434)

Browse Source
This commit is contained in:
Joe Orton 2019-07-08 09:23:48 +01:00
parent 2ae67b32b1
commit 7ee1cb5208
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apachectl.sh
View File

@ -49,10 +49,14 @@ graceful-stop)
/usr/bin/systemctl kill --signal=SIGWINCH $SVC /usr/bin/systemctl kill --signal=SIGWINCH $SVC
ERROR=$? ERROR=$?
;; ;;
configtest) configtest|-t)
$HTTPD -t $HTTPD -t
ERROR=$? ERROR=$?
;; ;;
-v|-V)
$HTTPD $ACMD
ERROR=$?
;;
*) *)
echo apachectl: The \"$ACMD\" option is not supported. 1>&2 echo apachectl: The \"$ACMD\" option is not supported. 1>&2
ERROR=2 ERROR=2

7
httpd.spec
View File

@ -406,7 +406,8 @@ sed -i \
docs/conf/extra/*.conf docs/conf/extra/*.conf
# Set correct path for httpd binary in apachectl script # Set correct path for httpd binary in apachectl script
sed -i 's,@HTTPDBIN@,%{_sbindir}/httpd,g' $RPM_SOURCE_DIR/apachectl.sh sed 's,@HTTPDBIN@,%{_sbindir}/httpd,g' $RPM_SOURCE_DIR/apachectl.sh \
> apachectl.sh
# Create cache directory # Create cache directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/httpd \
@ -474,7 +475,8 @@ install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \
$RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
# Install scripts # Install scripts
install -p -m 755 $RPM_SOURCE_DIR/apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl install -m 755 apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl
touch -r $RPM_SOURCE_DIR/apachectl.sh $RPM_BUILD_ROOT%{_sbindir}/apachectl
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/initscripts/legacy-actions/httpd
for f in graceful configtest; do for f in graceful configtest; do
install -p -m 755 $RPM_SOURCE_DIR/action-${f}.sh \ install -p -m 755 $RPM_SOURCE_DIR/action-${f}.sh \
@ -743,6 +745,7 @@ exit $rv
%changelog %changelog
* Mon Jul 8 2019 Joe Orton <jorton@redhat.com> - 2.4.39-10 * Mon Jul 8 2019 Joe Orton <jorton@redhat.com> - 2.4.39-10
- htpasswd: add SHA-256/512 support - htpasswd: add SHA-256/512 support
- apachectl: restore -V/-v/-t support (#1727434)
* Fri Jun 21 2019 Joe Orton <jorton@redhat.com> - 2.4.39-9 * Fri Jun 21 2019 Joe Orton <jorton@redhat.com> - 2.4.39-9
- create instance-specific StateDir in httpd@.service, instance.conf - create instance-specific StateDir in httpd@.service, instance.conf