rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

- for older distros, still use SuSEFirewall2 [bsc#1071548c#7]

Browse Source 
- Replace SuSEFirewall2 by firewalld (fate#323460)

OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=546
This commit is contained in:
Petr Gajdos
2018-01-30 09:39:18 +00:00
committed by Git OBS Bridge
parent 4c631e26bb
commit b20eb1a5ec
6 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apache2.spec
View File

@@ -57,6 +57,11 @@
%define runtimedir %{_localstatedir}/run
%define mods_static unixd
%endif
%if 0%{?suse_version} >= 1500
%define use_firewalld 1
%else
%define use_firewalld 0
%endif
Name: apache2
Version: 2.4.29
Release: 0
@@ -88,8 +93,13 @@ Source31: apache2-README-instances.txt
Source45: sysconf_addword
Source46: a2enflag
Source47: a2enmod
Source49: apache2.firewall
Source50: apache2.ssl-firewall
%if %{use_firewalld}
Source49: apache2.firewalld
Source50: apache2.ssl.firewalld
%else
Source51: apache2.susefirewall
Source52: apache2.ssl.susefirewall
%endif
Source100: apache2-httpd.conf
Source101: apache2-errors.conf
Source102: apache2-default-server.conf
@@ -686,9 +696,14 @@ pushd %{buildroot}/%{_bindir}
popd
# install firewall information file
%if %{use_firewalld}
install -D -m 644 %{SOURCE49} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
install -D -m 644 %{SOURCE50} %{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml
%else
install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
install -m 644 %{SOURCE49} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
install -m 644 %{SOURCE50} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
install -m 644 %{SOURCE52} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
%endif
ln -sf %{_bindir}/apxs %{buildroot}%{_sbindir}
#
# compat symlinks apache2 -> apache
@@ -861,8 +876,15 @@ mv %{buildroot}/%{sysconfdir}/original .
%{_datadir}/%{name}/deprecated-scripts
%{_datadir}/%{name}/script-helpers
%{_datadir}/%{name}/sysconf_addword
%if %{use_firewalld}
%dir %{_libexecdir}/firewalld
%dir %{_libexecdir}/firewalld/services
%{_libexecdir}/firewalld/services/%{name}.xml
%{_libexecdir}/firewalld/services/%{name}-ssl.xml
%else
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
%endif
%if 0%{?suse_version} == 1110
/usr/share/apache2/find_mpm
/usr/share/apache2/get_includes