rpms/nginx
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Revert "Move default server to default.conf (#1220094)"

Browse Source 
This reverts commit 78b11f8ceb.
This commit is contained in:
Jamie Nguyen 2015-05-10 10:24:59 +01:00
parent 4bafbd1788
commit 14377bb60f
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
default.conf
View File

@ -1,20 +0,0 @@
server {
listen 80 default_server;
listen [::]:80 default_server;
server_name _;
root /usr/share/nginx/html;
# Load configuration files for the default server block.
include /etc/nginx/default.d/*.conf;
location / {
}
error_page 404 /404.html;
location = /40x.html {
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
}
}

21
nginx.conf
View File

@ -31,4 +31,25 @@ http {
# See http://nginx.org/en/docs/ngx_core_module.html#include # See http://nginx.org/en/docs/ngx_core_module.html#include
# for more information. # for more information.
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
server {
listen 80 default_server;
listen [::]:80 default_server;
server_name _;
root /usr/share/nginx/html;
# Load configuration files for the default server block.
include /etc/nginx/default.d/*.conf;
location / {
}
error_page 404 /404.html;
location = /40x.html {
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
}
}
} }

4
nginx.spec
View File

@ -37,7 +37,6 @@ Source11: nginx.logrotate
Source12: nginx.conf Source12: nginx.conf
Source13: nginx-upgrade Source13: nginx-upgrade
Source14: nginx-upgrade.8 Source14: nginx-upgrade.8
Source20: default.conf
Source100: index.html Source100: index.html
Source101: poweredby.png Source101: poweredby.png
Source102: nginx-logo.png Source102: nginx-logo.png
@ -175,8 +174,6 @@ install -p -d -m 0755 %{buildroot}%{nginx_webroot}
install -p -m 0644 %{SOURCE12} \ install -p -m 0644 %{SOURCE12} \
%{buildroot}%{nginx_confdir} %{buildroot}%{nginx_confdir}
install -p -m 0644 %{SOURCE20} \
%{buildroot}%{nginx_confdir}/conf.d
install -p -m 0644 %{SOURCE100} \ install -p -m 0644 %{SOURCE100} \
%{buildroot}%{nginx_webroot} %{buildroot}%{nginx_webroot}
install -p -m 0644 %{SOURCE101} %{SOURCE102} \ install -p -m 0644 %{SOURCE101} %{SOURCE102} \
@ -242,7 +239,6 @@ fi
%config(noreplace) %{nginx_confdir}/uwsgi_params %config(noreplace) %{nginx_confdir}/uwsgi_params
%config(noreplace) %{nginx_confdir}/uwsgi_params.default %config(noreplace) %{nginx_confdir}/uwsgi_params.default
%config(noreplace) %{nginx_confdir}/win-utf %config(noreplace) %{nginx_confdir}/win-utf
%config(noreplace) %{nginx_confdir}/conf.d/default.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/nginx %config(noreplace) %{_sysconfdir}/logrotate.d/nginx
%dir %{perl_vendorarch}/auto/nginx %dir %{perl_vendorarch}/auto/nginx
%{perl_vendorarch}/nginx.pm %{perl_vendorarch}/nginx.pm