diff --git a/apache2-README-configuration.txt b/apache2-README-configuration.txt new file mode 100644 index 0000000..2136144 --- /dev/null +++ b/apache2-README-configuration.txt @@ -0,0 +1,27 @@ +httpd configuration @ SUSE +========================== + +`httpd` command can stand for `httpd-prefork`, `httpd-worker` +and `httpd-event`, depending on which httpd mpm rpm package is +installed. In case more such mpm packages are installed, `httpd` +points to one with higher priority defined in update alternatives. + +There are several levels of configuration possible: + +1. systemctl start apache2 +When httpd is run trough systemctl service, /etc/apache2/httpd.conf +is used as a base and sysconfig varibables translated into +/etc/apache2/sysconfig.d/ used. + +2. httpd -f /etc/apache2/httpd.conf +/etc/apache2/httpd.conf can be used directly, without systemd +assistance. /etc/apache2/sysconfig.d is not included in that +case. + +3. httpd -f /usr/share/doc/package/apache2/conf/httpd.conf +It is possible to experiment with upstream example +configuration. Do not forgot + +For more configuration tips, install documentation package +apache-rex. + diff --git a/apache2.changes b/apache2.changes index fe0e83b..ac5e7d9 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 10 16:45:36 UTC 2020 - pgajdos@suse.com + +- actually install suse provided READMEs +- install upstream configuration example +- added sources + + apache2-README-configuration.txt + ------------------------------------------------------------------- Wed Dec 9 19:36:02 UTC 2020 - pgajdos@suse.com diff --git a/apache2.spec b/apache2.spec index c2ee03e..2b825d3 100644 --- a/apache2.spec +++ b/apache2.spec @@ -178,6 +178,7 @@ Source191: apache2-vhost-ssl.template # READMEs and other documentation Source200: apache2-README-access_compat.txt Source201: apache2-README-instances.txt +Source202: apache2-README-configuration.txt # layout of system dirs configuration, may be upstreamed Patch0: apache2-system-dirs-layout.patch # apachectl is frontend for start_apache2, suse specific @@ -507,7 +508,7 @@ mkdir -p %{buildroot}%{logfiledir} \ # save MODULE_MAGIC_NUMBER mkdir -p %{buildroot}/%{_libexecdir} -cat > %{buildroot}/%{_libexecdir}/%{name}_MMN <<-EOF +cat > %{buildroot}/%{_libexecdir}/apache2_MMN <<-EOF #!/bin/sh echo %{apache_mmn} EOF @@ -590,10 +591,15 @@ ln -sf ../mime.types %{buildroot}/%{sysconfdir}/mime.types make DESTDIR=%{buildroot} install-icons make DESTDIR=%{buildroot} install-error +make DESTDIR=%{buildroot} sysconfdir=%{_docdir}/apache2/conf install-conf mkdir -p %{buildroot}%{_mandir}/man8/ install -D -m 644 docs/man/suexec.8 %{buildroot}%{_mandir}/man8/ install -D -m 644 docs/man/httpd.8 %{buildroot}%{_mandir}/man8/ + +cp %{SOURCE200} README-access_compat.txt +cp %{SOURCE201} README-instances.txt +cp %{SOURCE202} README-configuration.txt %endif # utils install @@ -827,7 +833,7 @@ exit 0 %attr(750,%{httpduser},root) %dir %{localstatedir} %dir %{libexecdir} %dir %{_libexecdir} -%attr(755,root,root) %{_libexecdir}/%{name}_MMN +%attr(755,root,root) %{_libexecdir}/apache2_MMN %dir %{sysconfdir} %config %{sysconfdir}/magic %config %{sysconfdir}/mime.types @@ -870,6 +876,7 @@ exit 0 %{_mandir}/man8/httpd.8.* %{_mandir}/man8/suexec.8.* %doc support/SHA1 +%{_docdir}/apache2/conf %endif # utils files