From cd2db81fd815c4af9b05b3da49849712ab984bf7 Mon Sep 17 00:00:00 2001
From: Daniel Steiner <daniel.steiner@greenmail.ch>
Date: Thu, 6 Jan 2022 08:30:30 +0100
Subject: [PATCH] Missing configurations added

---
 fedora/SPECS/mod_tile.spec | 42 ++++++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec
index d3e6b62..859f087 100644
--- a/fedora/SPECS/mod_tile.spec
+++ b/fedora/SPECS/mod_tile.spec
@@ -1,16 +1,22 @@
 Name:		  mod_tile
 Version:	0.6.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik.
 
+%define   geo_user geo
+%define   daemon_name renderd
+
 License:	GPLv2
 URL:			https://github.com/openstreetmap/mod_tile
 Source0:	%{name}-%{version}.tar.gz
 Source1:	10-tile.conf
 Source2:	mod_tile.conf
+Source3:  mod_tile_renderd.service
+Source4:  mod_tile_tmp_d.conf
 
 BuildRequires: httpd-devel, apr
 BuildRequires: mapnik-devel
+BuildRequires: libcurl-devel
 BuildRequires: iniparser-devel
 BuildRequires: sqlite-devel
 
@@ -40,7 +46,8 @@ at compile time, see: render_config.h
 ./autogen.sh
 %configure \
 	--with-apxs \
-	--with-libmapnik
+	--with-libmapnik \
+	--with-libcurl
 %{__make}
 
 %install
@@ -48,10 +55,24 @@ at compile time, see: render_config.h
 %{__make} install-%{name} DESTDIR=%{buildroot}
 %{__install} -D %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/10-tile.conf
 %{__install} -D %{S:2} %{buildroot}%{_sysconfdir}/httpd/conf.d/mod_tile.conf
+%{__install} -D %{S:3} %{buildroot}%{_systemd_util_dir}/system/%{daemon_name}.service
+%{__install} -D %{S:4} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{daemon_name}.conf
+%{__install} -d %{S:4} %{buildroot}%{_rundir}%{daemon_name}
+%{__install} -d %{S:4} %{buildroot}/geodata/mod_tile
+
+%pre
+if [ $1 -eq 1 ]; then
+	getent group %{geo_user} > /dev/null || groupadd -r %{geo_user}
+	getent passwd %{geo_user} > /dev/null || \
+	    useradd -r -d %{_localstatedir}/lib/nginx -g %{geo_user} \
+	    -s /sbin/nologin -c "Nginx web server" %{geo_user}
+	exit 0
+fi
 
 %post
 if [ $1 -eq 1 ]; then
 	/usr/bin/systemctl reload httpd.service >/dev/null 2>&1 || :
+	%systemd_post %{daemon_name}.service
 fi
 
 %postun
@@ -59,20 +80,33 @@ if [ $1 -eq 1 ]; then
 	/usr/bin/systemctl reload httpd.service >/dev/null 2>&1 || :
 fi
 
+%preun
+if [ $1 -eq 0 ]; then
+	%systemd_preun %{daemon_name}.service
+fi
+
 %clean
 [ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %files
 %doc COPYING
-%config(noreplace) %{_sysconfdir}/renderd.conf
+%config(noreplace) %{_sysconfdir}/%{daemon_name}.conf
 %config %{_sysconfdir}/httpd/conf.modules.d/10-tile.conf
-%config %{_sysconfdir}/httpd/conf.d/mod_tile.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_tile.conf
+%config %{_sysconfdir}/tmpfiles.d/%{daemon_name}.conf
+%config(noreplace) %{buildroot}%{_sysconfdir}/tmpfiles.d/%{daemon_name}.conf
 %{_bindir}/render*
 %{_libdir}/httpd/modules/%{name}.so
 %{_mandir}/man1/*
+%attr(0755, %{geo_user}, %{geo_user}) %dir /geodata/mod_tile
+%attr(0775, %{geo_user}, %{geo_user}) %dir %{_rundir}%{daemon_name}
 
 %changelog
+* Thu Jan 6 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- Add systemd startup config. Add socket dir. Add tmpfiles.d config.
+- Create cache directory, which is not default.
+
 * Tue Jan 4 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
 - Update to latest (0.6.1).