From f43fc9eb7b3cf65d157b4fb0e2767b0abe7bde92b7f1ab328f4ac97b41ca3efb Mon Sep 17 00:00:00 2001 From: Artem Chernikov Date: Wed, 7 Feb 2018 15:08:41 +0000 Subject: [PATCH 1/2] - Install /etc/nginx/vhosts.d directory for default installation to house custom virtual hosts configuration files OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=99 --- nginx.changes | 6 ++++++ nginx.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nginx.changes b/nginx.changes index 33ae736..020d04e 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 7 15:07:47 UTC 2018 - achernikov@suse.com + +- Install /etc/nginx/vhosts.d directory for default installation + to house custom virtual hosts configuration files + ------------------------------------------------------------------- Mon Dec 18 02:59:27 UTC 2017 - avindra@opensuse.org diff --git a/nginx.spec b/nginx.spec index cec85b2..4543ba9 100644 --- a/nginx.spec +++ b/nginx.spec @@ -1,7 +1,7 @@ # # spec file for package nginx # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -285,6 +285,8 @@ cp -av contrib/vim/* \ %{buildroot}%{vim_data_dir}/ mkdir -p %{buildroot}%{_datadir}/nginx/ +mkdir -p %{buildroot}%{ngx_conf_dir}/vhosts.d/ + chmod a+rx contrib/geo2nginx.pl cp -av contrib/geo2nginx.pl contrib/unicode2nginx/ \ %{buildroot}%{_datadir}/nginx/ @@ -342,6 +344,7 @@ copydocs %{nginx_rtmp_module_path} \ %files %dir %{ngx_conf_dir}/ +%dir %{ngx_conf_dir}/vhosts.d %config(noreplace) %{ngx_conf_dir}/koi-utf %config(noreplace) %{ngx_conf_dir}/koi-win %config(noreplace) %{ngx_conf_dir}/fastcgi_params From 477548018f51fe17c8d6ae94fb3acd3d0f9458958445b95d827ca8b45be3ea7d Mon Sep 17 00:00:00 2001 From: Artem Chernikov Date: Wed, 7 Feb 2018 15:44:02 +0000 Subject: [PATCH 2/2] - Install /etc/nginx/conf.d directory for custom user configuration files OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=100 --- nginx.changes | 6 ++++++ nginx.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/nginx.changes b/nginx.changes index 020d04e..1fc1c35 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 7 15:43:27 UTC 2018 - achernikov@suse.com + +- Install /etc/nginx/conf.d directory for custom user configuration + files + ------------------------------------------------------------------- Wed Feb 7 15:07:47 UTC 2018 - achernikov@suse.com diff --git a/nginx.spec b/nginx.spec index 4543ba9..4ec03ee 100644 --- a/nginx.spec +++ b/nginx.spec @@ -286,6 +286,7 @@ cp -av contrib/vim/* \ mkdir -p %{buildroot}%{_datadir}/nginx/ mkdir -p %{buildroot}%{ngx_conf_dir}/vhosts.d/ +mkdir -p %{buildroot}%{ngx_conf_dir}/conf.d/ chmod a+rx contrib/geo2nginx.pl cp -av contrib/geo2nginx.pl contrib/unicode2nginx/ \ @@ -345,6 +346,7 @@ copydocs %{nginx_rtmp_module_path} \ %files %dir %{ngx_conf_dir}/ %dir %{ngx_conf_dir}/vhosts.d +%dir %{ngx_conf_dir}/conf.d %config(noreplace) %{ngx_conf_dir}/koi-utf %config(noreplace) %{ngx_conf_dir}/koi-win %config(noreplace) %{ngx_conf_dir}/fastcgi_params