diff --git a/nginx-1.21.1-conf-sites-enabled.patch b/nginx-1.22.0-sites-modules-enabled.patch similarity index 78% rename from nginx-1.21.1-conf-sites-enabled.patch rename to nginx-1.22.0-sites-modules-enabled.patch index 8e608c5..aff4aab 100644 --- a/nginx-1.21.1-conf-sites-enabled.patch +++ b/nginx-1.22.0-sites-modules-enabled.patch @@ -1,6 +1,14 @@ ---- nginx-1.21.1/conf/nginx.conf.orig 2021-08-30 13:43:13.100432769 +0200 -+++ nginx-1.21.1/conf/nginx.conf 2021-08-30 13:50:28.498600068 +0200 -@@ -32,28 +32,28 @@ +--- nginx-1.22.0/conf/nginx.conf.orig 2022-06-10 11:56:30.002319632 +0200 ++++ nginx-1.22.0/conf/nginx.conf 2022-06-10 11:57:15.722089156 +0200 +@@ -8,6 +8,7 @@ + + #pid logs/nginx.pid; + ++include modules-enabled/*.conf; + + events { + worker_connections 1024; +@@ -32,28 +33,28 @@ #gzip on; @@ -45,7 +53,7 @@ # proxy the PHP scripts to Apache listening on 127.0.0.1:80 # #location ~ \.php$ { -@@ -76,7 +76,7 @@ +@@ -76,7 +77,7 @@ #location ~ /\.ht { # deny all; #} @@ -54,7 +62,7 @@ # another virtual host using mix of IP-, name-, and port-based configuration -@@ -114,4 +114,5 @@ +@@ -114,4 +115,5 @@ # } #} diff --git a/nginx.spec b/nginx.spec index 292a382..5c5af40 100644 --- a/nginx.spec +++ b/nginx.spec @@ -1,6 +1,6 @@ Name: nginx Version: 1.22.0 -Release: 2mamba +Release: 3mamba Summary: High Performance Load Balancer, Web Server and Reverse Proxy Group: System/Servers Vendor: openmamba @@ -11,7 +11,7 @@ Source: https://github.com/nginx/nginx.git/release-%{version}/nginx-%{ver Source1: nginx.service Source2: nginx-fastcgi-php.conf Source3: nginx-sites-available-default -Patch0: nginx-1.21.1-conf-sites-enabled.patch +Patch0: nginx-1.22.0-sites-modules-enabled.patch License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -35,46 +35,52 @@ High Performance Load Balancer, Web Server and Reverse Proxy. %prep %setup -q -%patch0 -p1 +#-D -T +#%patch0 -p1 %build +#:<< _EOF auto/configure \ --prefix=%{_localstatedir}/www/nginx \ --sbin-path=%{_sbindir}/nginx \ --conf-path=%{_sysconfdir}/nginx/nginx.conf \ - --modules-path=%{_libdir}/nginx/ \ + --modules-path=%{_libdir}/nginx/modules \ --error-log-path=%{_localstatedir}/log/nginx/error_log \ --http-log-path=%{_localstatedir}/log/nginx/access_log \ --pid-path=/run/nginx.pid \ + --with-compat \ + --with-debug \ + --with-file-aio \ --with-select_module \ --with-poll_module \ - --with-http_ssl_module \ - --with-http_v2_module \ - --with-http_realip_module \ + --with-http_auth_request_module \ --with-http_addition_module \ - --with-http_xslt_module=dynamic \ - --with-http_image_filter_module=dynamic \ - --with-http_geoip_module=dynamic \ - --with-http_sub_module \ --with-http_dav_module \ + --with-http_degradation_module \ --with-http_flv_module \ - --with-http_mp4_module \ + --with-http_geoip_module=dynamic \ --with-http_gunzip_module \ --with-http_gzip_static_module \ - --with-http_auth_request_module \ - --with-http_random_index_module \ - --with-http_secure_link_module \ - --with-http_degradation_module \ - --with-http_slice_module \ - --with-http_stub_status_module \ + --with-http_image_filter_module=dynamic \ + --with-http_mp4_module \ --with-http_perl_module=dynamic \ + --with-http_random_index_module \ + --with-http_realip_module \ + --with-http_secure_link_module \ + --with-http_slice_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ + --with-http_sub_module \ + --with-http_v2_module \ + --with-http_xslt_module=dynamic \ --with-mail=dynamic \ --with-mail_ssl_module \ --with-stream=dynamic \ --with-stream_ssl_module \ --with-stream_realip_module \ --with-stream_geoip_module=dynamic \ - --with-stream_ssl_preread_module + --with-stream_ssl_preread_module \ + --with-threads %make @@ -86,6 +92,7 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/nginx.service install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/nginx/snippets/fastcgi-php.conf install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/nginx/sites-available/default install -d -m0755 %{buildroot}%{_sysconfdir}/nginx/sites-{available,enabled} +install -d -m0755 %{buildroot}%{_sysconfdir}/nginx/modules-{available,enabled} install -d -m0755 %{buildroot}%{_localstatedir}/www/html cp %{buildroot}%{_localstatedir}/www/nginx/html/index.html \ @@ -128,16 +135,19 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' %dir %{_sysconfdir}/nginx/sites-available %config(noreplace) %{_sysconfdir}/nginx/sites-available/default %dir %{_sysconfdir}/nginx/sites-enabled +%dir %{_sysconfdir}/nginx/modules-available +%dir %{_sysconfdir}/nginx/modules-enabled %{_sbindir}/nginx %{_unitdir}/nginx.service %dir %{_libdir}/nginx -%{_libdir}/nginx/ngx_mail_module.so -%{_libdir}/nginx/ngx_stream_module.so -%{_libdir}/nginx/ngx_http_geoip_module.so -%{_libdir}/nginx/ngx_http_image_filter_module.so -%{_libdir}/nginx/ngx_http_perl_module.so -%{_libdir}/nginx/ngx_http_xslt_filter_module.so -%{_libdir}/nginx/ngx_stream_geoip_module.so +%dir %{_libdir}/nginx/modules +%{_libdir}/nginx/modules/ngx_mail_module.so +%{_libdir}/nginx/modules/ngx_stream_module.so +%{_libdir}/nginx/modules/ngx_http_geoip_module.so +%{_libdir}/nginx/modules/ngx_http_image_filter_module.so +%{_libdir}/nginx/modules/ngx_http_perl_module.so +%{_libdir}/nginx/modules/ngx_http_xslt_filter_module.so +%{_libdir}/nginx/modules/ngx_stream_geoip_module.so %{perl_sitearch}/* %dir %{_localstatedir}/www/nginx %dir %{_localstatedir}/www/nginx/html @@ -147,6 +157,9 @@ find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' %{_mandir}/man3/nginx.3pm* %changelog +* Fri Jun 10 2022 Silvan Calarco 1.22.0-3mamba +- add and use modules-enabled folder; add more configuration options + * Sat Jun 04 2022 Silvan Calarco 1.22.0-2mamba - restore conf-sites-enabled patch