cpet/hiawatha
1
0
Fork 0
forked from pool/hiawatha
Code Pull Requests Activity

Accepting request 718161 from home:mgerstner:branches:server:http

Browse Source 
- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
  firewalld, see [1].
  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html

OBS-URL: https://build.opensuse.org/request/show/718161
OBS-URL: https://build.opensuse.org/package/show/server:http/hiawatha?expand=0&rev=101
This commit is contained in:
Marguerite Su 2019-08-15 09:59:55 +00:00 committed by Git OBS Bridge
parent 6b5abbdd55
commit 6187258123
4 changed files with 9 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hiawatha-ssl.firewall
View File

@ -1,17 +0,0 @@
## Name: Hiwatha webserver (https)
## Description: Opens https port for Hiawatha webserver.
# space separated list of allowed TCP ports
TCP="https"
# space separated list of allowed UDP ports
UDP="https"
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""

8
hiawatha.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jul 24 09:26:57 UTC 2019 - matthias.gerstner@suse.com
- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by
firewalld, see [1].
[1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 4 20:13:01 UTC 2019 - Mariusz Fik <fisiu@opensuse.org> Mon Mar 4 20:13:01 UTC 2019 - Mariusz Fik <fisiu@opensuse.org>

17
hiawatha.firewall
View File

@ -1,17 +0,0 @@
## Name: Hiwatha webserver (http)
## Description: Opens http port for Hiawatha webserver.
# space separated list of allowed TCP ports
TCP="http"
# space separated list of allowed UDP ports
UDP="http"
# space separated list of allowed RPC services
RPC=""
# space separated list of allowed IP protocols
IP=""
# space separated list of allowed UDP broadcast ports
BROADCAST=""

27
hiawatha.spec
View File

@ -20,12 +20,6 @@
%define webroot /srv/www %define webroot /srv/www
%define mbedtls_version %(rpm -q mbedtls-devel --qf "%%{VERSION}") %define mbedtls_version %(rpm -q mbedtls-devel --qf "%%{VERSION}")
%if 0%{?suse_version} >= 1500
%define use_firewalld 1
%else
%define use_firewalld 0
%endif
Name: hiawatha Name: hiawatha
Version: 10.9 Version: 10.9
Release: 0 Release: 0
@ -36,13 +30,10 @@ Url: http://www.hiawatha-webserver.org
Source0: http://www.hiawatha-webserver.org/files/%{name}-%{version}.tar.gz Source0: http://www.hiawatha-webserver.org/files/%{name}-%{version}.tar.gz
Source1: %{name}.logrotate Source1: %{name}.logrotate
Source2: %{name}.service Source2: %{name}.service
Source100: %{name}.firewall
Source101: %{name}-ssl.firewall
%if %{use_firewalld}
Source102: %{name}.firewalld Source102: %{name}.firewalld
Source103: %{name}-ssl.firewalld Source103: %{name}-ssl.firewalld
%endif
BuildRequires: cmake >= 3.0 BuildRequires: cmake >= 3.0
BuildRequires: firewall-macros
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: mbedtls-devel >= 2.3 BuildRequires: mbedtls-devel >= 2.3
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -51,9 +42,6 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if %{use_firewalld}
BuildRequires: firewall-macros
%endif
Requires: logrotate Requires: logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires} %{?systemd_requires}
@ -128,19 +116,10 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
# run as wwwrun user # run as wwwrun user
sed "s/#ServerId = www-data/ServerId = wwwrun/" -i %{buildroot}%{_sysconfdir}/hiawatha/hiawatha.conf sed "s/#ServerId = www-data/ServerId = wwwrun/" -i %{buildroot}%{_sysconfdir}/hiawatha/hiawatha.conf
# susefirewall config files
install -D -m 0644 %{SOURCE100} \
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
install -D -m 0644 %{SOURCE101} \
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
# firewalld config files
%if %{use_firewalld}
install -D -m 0644 %{SOURCE102} \ install -D -m 0644 %{SOURCE102} \
%{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
install -D -m 0644 %{SOURCE103} \ install -D -m 0644 %{SOURCE103} \
%{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml %{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml
%endif
%pre %pre
%service_add_pre %{name}.service %service_add_pre %{name}.service
@ -170,14 +149,10 @@ install -D -m 0644 %{SOURCE103} \
%config(noreplace) %{_sysconfdir}/%{name}/index.xslt %config(noreplace) %{_sysconfdir}/%{name}/index.xslt
%config(noreplace) %{_sysconfdir}/%{name}/error.xslt %config(noreplace) %{_sysconfdir}/%{name}/error.xslt
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl
%if %{use_firewalld}
%dir %{_libexecdir}/firewalld %dir %{_libexecdir}/firewalld
%dir %{_libexecdir}/firewalld/services %dir %{_libexecdir}/firewalld/services
%{_libexecdir}/firewalld/services/%{name}.xml %{_libexecdir}/firewalld/services/%{name}.xml
%{_libexecdir}/firewalld/services/%{name}-ssl.xml %{_libexecdir}/firewalld/services/%{name}-ssl.xml
%endif
%{_mandir}/man1/{cgi-wrapper,hiawatha,ssi-cgi,wigwam}.1%{ext_man} %{_mandir}/man1/{cgi-wrapper,hiawatha,ssi-cgi,wigwam}.1%{ext_man}
%dir %{webroot}/%{name} %dir %{webroot}/%{name}
%dir %{webroot}/%{name}/htdocs %dir %{webroot}/%{name}/htdocs