diff --git a/.gitignore b/.gitignore index 4f0a93f..00acede 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ x86_64 /httpd-*.tar.bz2 /httpd*.8 /results_httpd +/htcacheclean.service.8 diff --git a/htcacheclean.service b/htcacheclean.service index 166067b..d1e9d60 100644 --- a/htcacheclean.service +++ b/htcacheclean.service @@ -1,6 +1,7 @@ [Unit] -Description=Disk Cache Cleaning Daemon for Apache HTTP Server +Description=Disk Cache Cleaning Daemon for the Apache HTTP Server After=httpd.service +Documentation=man:htcacheclean.service(8) [Service] Type=forking diff --git a/htcacheclean.service.xml b/htcacheclean.service.xml new file mode 100644 index 0000000..d771ae7 --- /dev/null +++ b/htcacheclean.service.xml @@ -0,0 +1,123 @@ + + + + + + htcacheclean systemd unit + httpd + AuthorOrtonJoejorton@redhat.com + + + + htcacheclean.service + 8 + + + + htcacheclean.service + htcacheclean unit file for systemd + + + + + /usr/lib/systemd/system/htcacheclean.service + + + + + Description + + This manual page describes the systemd + unit file for the htcacheclean daemon. This + unit file provides a service which runs + htcacheclean is run in daemon mode, + periodically cleaning the disk cache root to ensure disk space + usage is within configured limits. + + + + + Options + + The service is configured by configuration file + /etc/sysconfig/htcacheclean. The following + variables are used, following standard systemd + EnvironmentFile= syntax: + + + + INTERVAL= + + Sets the interval between cache clean runs, in + minutes. By default this is configured as + 15. + + + + CACHE_ROOT= + + Sets the directory name used for the cache + root. By default this is configured as + /var/cache/httpd/proxy. + + + + LIMIT= + + Sets the total disk cache space limit, in + bytes. Use a K or M + suffix to signify kilobytes or megabytes. By default this is + set to 100M. + + + + OPTIONS= + + Any other options to pass to + htcacheclean. + + + + + + Files + + /usr/lib/systemd/system/htcacheclean.service, + /etc/sysconfig/htcacheclean + + + + See also + + + htcacheclean8, + httpd8, + httpd.service8, + systemd.exec8 + + + + + + diff --git a/httpd.spec b/httpd.spec index 8938613..85d661c 100644 --- a/httpd.spec +++ b/httpd.spec @@ -13,7 +13,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.34 -Release: 10%{?dist} +Release: 11%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -49,6 +49,7 @@ Source29: 01-md.conf Source30: README.confd Source31: README.confmod Source32: httpd.service.xml +Source33: htcacheclean.service.xml Source40: htcacheclean.service Source41: htcacheclean.sysconf Source42: httpd-init.service @@ -275,6 +276,7 @@ sed 's/@MPM@/%{mpm}/' < $RPM_SOURCE_DIR/httpd.service.xml \ > httpd.service.xml xmlto man ./httpd.service.xml +xmlto man $RPM_SOURCE_DIR/htcacheclean.service.xml : Building with MMN %{mmn}, MMN-ISA %{mmnisa} : Default MPM is %{mpm}, vendor string is '%{vstring}' @@ -497,7 +499,7 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \ # Install systemd service man pages install -m 644 -p httpd.service.8 httpd-init.service.8 httpd.socket.8 \ - httpd@.service.8 \ + httpd@.service.8 htcacheclean.service.8 \ $RPM_BUILD_ROOT%{_mandir}/man8 # fix man page paths @@ -733,6 +735,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed Oct 31 2018 Joe Orton - 2.4.34-11 +- add htcacheclean.service(8) man page + * Fri Sep 28 2018 Joe Orton - 2.4.34-10 - apachectl: don't read /etc/sysconfig/httpd