Merge branch 'master' into epel7
This commit is contained in:
commit
bb4239efa0
68
nginx.conf
68
nginx.conf
@ -35,15 +35,15 @@ http {
|
|||||||
|
|
||||||
#gzip on;
|
#gzip on;
|
||||||
|
|
||||||
|
index index.html index.htm;
|
||||||
|
|
||||||
# Load modular configuration files from the /etc/nginx/conf.d directory.
|
# Load modular configuration files from the /etc/nginx/conf.d directory.
|
||||||
# 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;
|
||||||
|
|
||||||
index index.html index.htm;
|
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80 default_server;
|
||||||
server_name localhost;
|
server_name localhost;
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
|
|
||||||
@ -51,6 +51,9 @@ http {
|
|||||||
|
|
||||||
#access_log /var/log/nginx/host.access.log main;
|
#access_log /var/log/nginx/host.access.log main;
|
||||||
|
|
||||||
|
# Load configuration files for the default server block.
|
||||||
|
include /etc/nginx/default.d/*.conf;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -65,64 +68,5 @@ http {
|
|||||||
error_page 500 502 503 504 /50x.html;
|
error_page 500 502 503 504 /50x.html;
|
||||||
location = /50x.html {
|
location = /50x.html {
|
||||||
}
|
}
|
||||||
|
|
||||||
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
|
|
||||||
#
|
|
||||||
#location ~ \.php$ {
|
|
||||||
# proxy_pass http://127.0.0.1;
|
|
||||||
#}
|
|
||||||
|
|
||||||
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
|
|
||||||
#
|
|
||||||
#location ~ \.php$ {
|
|
||||||
# root html;
|
|
||||||
# fastcgi_pass 127.0.0.1:9000;
|
|
||||||
# fastcgi_index index.php;
|
|
||||||
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
|
|
||||||
# include fastcgi_params;
|
|
||||||
#}
|
|
||||||
|
|
||||||
# deny access to .htaccess files, if Apache's document root
|
|
||||||
# concurs with nginx's one
|
|
||||||
#
|
|
||||||
#location ~ /\.ht {
|
|
||||||
# deny all;
|
|
||||||
#}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# another virtual host using mix of IP-, name-, and port-based configuration
|
|
||||||
#
|
|
||||||
#server {
|
|
||||||
# listen 8000;
|
|
||||||
# listen somename:8080;
|
|
||||||
# server_name somename alias another.alias;
|
|
||||||
# root html;
|
|
||||||
|
|
||||||
# location / {
|
|
||||||
# }
|
|
||||||
#}
|
|
||||||
|
|
||||||
|
|
||||||
# HTTPS server
|
|
||||||
#
|
|
||||||
#server {
|
|
||||||
# listen 443;
|
|
||||||
# server_name localhost;
|
|
||||||
# root html;
|
|
||||||
|
|
||||||
# ssl on;
|
|
||||||
# ssl_certificate cert.pem;
|
|
||||||
# ssl_certificate_key cert.key;
|
|
||||||
|
|
||||||
# ssl_session_timeout 5m;
|
|
||||||
|
|
||||||
# ssl_protocols SSLv2 SSLv3 TLSv1;
|
|
||||||
# ssl_ciphers HIGH:!aNULL:!MD5;
|
|
||||||
# ssl_prefer_server_ciphers on;
|
|
||||||
|
|
||||||
# location / {
|
|
||||||
# }
|
|
||||||
#}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
46
nginx.spec
46
nginx.spec
@ -27,7 +27,7 @@
|
|||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.6.2
|
Version: 1.6.2
|
||||||
Release: 1%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Summary: A high performance web server and reverse proxy server
|
Summary: A high performance web server and reverse proxy server
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -66,12 +66,14 @@ BuildRequires: pcre-devel
|
|||||||
BuildRequires: perl-devel
|
BuildRequires: perl-devel
|
||||||
BuildRequires: perl(ExtUtils::Embed)
|
BuildRequires: perl(ExtUtils::Embed)
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
|
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
|
||||||
Requires: GeoIP
|
Requires: GeoIP
|
||||||
Requires: gd
|
Requires: gd
|
||||||
Requires: openssl
|
Requires: openssl
|
||||||
Requires: pcre
|
Requires: pcre
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): nginx-filesystem
|
||||||
Provides: webserver
|
Provides: webserver
|
||||||
|
|
||||||
%if 0%{?with_systemd}
|
%if 0%{?with_systemd}
|
||||||
@ -90,6 +92,17 @@ Nginx is a web server and a reverse proxy server for HTTP, SMTP, POP3 and
|
|||||||
IMAP protocols, with a strong focus on high concurrency, performance and low
|
IMAP protocols, with a strong focus on high concurrency, performance and low
|
||||||
memory usage.
|
memory usage.
|
||||||
|
|
||||||
|
%package filesystem
|
||||||
|
Group: System Environment/Daemons
|
||||||
|
Summary: The basic directory layout for the Nginx server
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires(pre): shadow-utils
|
||||||
|
|
||||||
|
%description filesystem
|
||||||
|
The nginx-filesystem package contains the basic directory layout
|
||||||
|
for the Nginx server including the correct permissions for the
|
||||||
|
directories.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
@ -178,6 +191,7 @@ install -p -D -m 0644 %{SOURCE11} \
|
|||||||
%{buildroot}%{_sysconfdir}/logrotate.d/nginx
|
%{buildroot}%{_sysconfdir}/logrotate.d/nginx
|
||||||
|
|
||||||
install -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
|
install -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
|
||||||
|
install -p -d -m 0755 %{buildroot}%{nginx_confdir}/default.d
|
||||||
install -p -d -m 0700 %{buildroot}%{nginx_home}
|
install -p -d -m 0700 %{buildroot}%{nginx_home}
|
||||||
install -p -d -m 0700 %{buildroot}%{nginx_home_tmp}
|
install -p -d -m 0700 %{buildroot}%{nginx_home_tmp}
|
||||||
install -p -d -m 0700 %{buildroot}%{nginx_logdir}
|
install -p -d -m 0700 %{buildroot}%{nginx_logdir}
|
||||||
@ -198,8 +212,13 @@ install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \
|
|||||||
install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade
|
install -p -D -m 0755 %{SOURCE13} %{buildroot}%{_bindir}/nginx-upgrade
|
||||||
install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
|
install -p -D -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man8/nginx-upgrade.8
|
||||||
|
|
||||||
|
for i in ftdetect indent syntax; do
|
||||||
|
install -p -D -m644 contrib/vim/${i}/nginx.vim \
|
||||||
|
%{buildroot}%{_datadir}/vim/vimfiles/${i}/nginx.vim
|
||||||
|
done
|
||||||
|
|
||||||
%pre
|
|
||||||
|
%pre filesystem
|
||||||
getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group}
|
getent group %{nginx_group} > /dev/null || groupadd -r %{nginx_group}
|
||||||
getent passwd %{nginx_user} > /dev/null || \
|
getent passwd %{nginx_user} > /dev/null || \
|
||||||
useradd -r -d %{nginx_home} -g %{nginx_group} \
|
useradd -r -d %{nginx_home} -g %{nginx_group} \
|
||||||
@ -242,9 +261,12 @@ fi
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%doc LICENSE CHANGES README
|
%doc LICENSE CHANGES README
|
||||||
%{nginx_datadir}/
|
%{nginx_datadir}/html/*
|
||||||
%{_bindir}/nginx-upgrade
|
%{_bindir}/nginx-upgrade
|
||||||
%{_sbindir}/nginx
|
%{_sbindir}/nginx
|
||||||
|
%{_datadir}/vim/vimfiles/ftdetect/nginx.vim
|
||||||
|
%{_datadir}/vim/vimfiles/syntax/nginx.vim
|
||||||
|
%{_datadir}/vim/vimfiles/indent/nginx.vim
|
||||||
%{_mandir}/man3/nginx.3pm*
|
%{_mandir}/man3/nginx.3pm*
|
||||||
%{_mandir}/man8/nginx.8*
|
%{_mandir}/man8/nginx.8*
|
||||||
%{_mandir}/man8/nginx-upgrade.8*
|
%{_mandir}/man8/nginx-upgrade.8*
|
||||||
@ -279,8 +301,24 @@ fi
|
|||||||
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp}
|
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_home_tmp}
|
||||||
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir}
|
%attr(700,%{nginx_user},%{nginx_group}) %dir %{nginx_logdir}
|
||||||
|
|
||||||
|
%files filesystem
|
||||||
|
%dir %{nginx_datadir}
|
||||||
|
%dir %{nginx_datadir}/html
|
||||||
|
%dir %{nginx_confdir}
|
||||||
|
%dir %{nginx_confdir}/conf.d
|
||||||
|
%dir %{nginx_confdir}/default.d
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 22 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-3
|
||||||
|
- add vim files (#1142849)
|
||||||
|
|
||||||
|
* Mon Sep 22 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-2
|
||||||
|
- create nginx-filesystem subpackage (patch from Remi Collet)
|
||||||
|
- create /etc/nginx/default.d as a drop-in directory for configuration files
|
||||||
|
for the default server block
|
||||||
|
- clean up nginx.conf
|
||||||
|
|
||||||
* Wed Sep 17 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-1
|
* Wed Sep 17 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.6.2-1
|
||||||
- update to upstream release 1.6.2
|
- update to upstream release 1.6.2
|
||||||
- CVE-2014-3616 nginx: virtual host confusion (#1142573)
|
- CVE-2014-3616 nginx: virtual host confusion (#1142573)
|
||||||
|
Loading…
Reference in New Issue
Block a user