From c1fb0de89138286f5b0943405ab93d6b7f5bcbc5 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 07:38:28 +0100
Subject: [PATCH] configure with sites-enabled and site-available layout;
 remove .default configuration files [release 1.21.1-2mamba;Sun Aug 29 2021]

---
 nginx-1.21.1-conf-sites-enabled.patch |  8 ++++++++
 nginx.spec                            | 28 +++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 nginx-1.21.1-conf-sites-enabled.patch

diff --git a/nginx-1.21.1-conf-sites-enabled.patch b/nginx-1.21.1-conf-sites-enabled.patch
new file mode 100644
index 0000000..4754206
--- /dev/null
+++ b/nginx-1.21.1-conf-sites-enabled.patch
@@ -0,0 +1,8 @@
+--- nginx-1.21.1/conf/nginx.conf.orig	2021-08-29 11:08:19.726594969 +0200
++++ nginx-1.21.1/conf/nginx.conf	2021-08-29 11:10:19.197781120 +0200
+@@ -114,4 +114,5 @@
+     #    }
+     #}
+ 
++    include sites-enabled/*;
+ }
diff --git a/nginx.spec b/nginx.spec
index 857c533..9c96b5c 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -1,17 +1,18 @@
 Name:          nginx
 Version:       1.21.1
-Release:       1mamba
+Release:       2mamba
 Summary:       High Performance Load Balancer, Web Server and Reverse Proxy
 Group:         System/Servers
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://nginx.org/
-## GITSOURCE https://github.com/nginx/nginx.git release-1.15.5
 Source:        https://github.com/nginx/nginx.git/release-%{version}/nginx-%{version}.tar.bz2
 Source1:       nginx.service
+Patch0:        nginx-1.21.1-conf-sites-enabled.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
+#libdl.so.2()(64bit): /usr/lib64/libdl.so: file not owned by any package
 BuildRequires: glibc-devel
 BuildRequires: libGeoIP-devel
 BuildRequires: libgd-devel
@@ -33,6 +34,7 @@ High Performance Load Balancer, Web Server and Reverse Proxy.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 auto/configure \
@@ -80,6 +82,9 @@ auto/configure \
 %makeinstall
 
 install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/nginx.service
+install -d -m0755 %{buildroot}%{_sysconfdir}/nginx/sites-{available,enabled}
+
+rm -f %{buildroot}%{_sysconfdir}/nginx/*.default
 
 find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 
@@ -102,20 +107,16 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 %defattr(-,root,root)
 %dir %{_sysconfdir}/nginx
 %config(noreplace) %{_sysconfdir}/nginx/fastcgi.conf
-%{_sysconfdir}/nginx/fastcgi.conf.default
 %config(noreplace) %{_sysconfdir}/nginx/fastcgi_params
-%{_sysconfdir}/nginx/fastcgi_params.default
+%config(noreplace) %{_sysconfdir}/nginx/mime.types
+%config(noreplace) %{_sysconfdir}/nginx/nginx.conf
+%config(noreplace) %{_sysconfdir}/nginx/scgi_params
+%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params
 %{_sysconfdir}/nginx/koi-utf
 %{_sysconfdir}/nginx/koi-win
-%config(noreplace) %{_sysconfdir}/nginx/mime.types
-%{_sysconfdir}/nginx/mime.types.default
-%config(noreplace) %{_sysconfdir}/nginx/nginx.conf
-%{_sysconfdir}/nginx/nginx.conf.default
-%config(noreplace) %{_sysconfdir}/nginx/scgi_params
-%{_sysconfdir}/nginx/scgi_params.default
-%config(noreplace) %{_sysconfdir}/nginx/uwsgi_params
-%{_sysconfdir}/nginx/uwsgi_params.default
 %{_sysconfdir}/nginx/win-utf
+%dir %{_sysconfdir}/nginx/sites-available
+%dir %{_sysconfdir}/nginx/sites-enabled
 %{_sbindir}/nginx
 %{_unitdir}/nginx.service
 %dir %{_libdir}/nginx
@@ -134,6 +135,9 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 %{_mandir}/man3/nginx.3pm*
 
 %changelog
+* Sun Aug 29 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.21.1-2mamba
+- configure with sites-enabled and site-available layout; remove .default configuration files
+
 * Tue Jul 06 2021 Automatic Build System <autodist@mambasoft.it> 1.21.1-1mamba
 - automatic version update by autodist