diff options
Diffstat (limited to 'www-servers/nginx/files')
| -rw-r--r-- | www-servers/nginx/files/nginx.conf | 72 | ||||
| -rw-r--r-- | www-servers/nginx/files/nginx.initd-r2 | 89 | ||||
| -rw-r--r-- | www-servers/nginx/files/rtmp-nginx-1.11.0.patch | 39 |
3 files changed, 0 insertions, 200 deletions
diff --git a/www-servers/nginx/files/nginx.conf b/www-servers/nginx/files/nginx.conf deleted file mode 100644 index 74c015f708ca..000000000000 --- a/www-servers/nginx/files/nginx.conf +++ /dev/null @@ -1,72 +0,0 @@ -user nginx nginx; -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 1024; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main - '$remote_addr - $remote_user [$time_local] ' - '"$request" $status $bytes_sent ' - '"$http_referer" "$http_user_agent" ' - '"$gzip_ratio"'; - - client_header_timeout 10m; - client_body_timeout 10m; - send_timeout 10m; - - connection_pool_size 256; - client_header_buffer_size 1k; - large_client_header_buffers 4 2k; - request_pool_size 4k; - - gzip on; - gzip_min_length 1100; - gzip_buffers 4 8k; - gzip_types text/plain; - - output_buffers 1 32k; - postpone_output 1460; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - - keepalive_timeout 75 20; - - ignore_invalid_headers on; - - index index.html; - - server { - listen 127.0.0.1; - server_name localhost; - - access_log /var/log/nginx/localhost.access_log main; - error_log /var/log/nginx/localhost.error_log info; - - root /var/www/localhost/htdocs; - } - - # SSL example - #server { - # listen 127.0.0.1:443; - # server_name localhost; - - # ssl on; - # ssl_certificate /etc/ssl/nginx/nginx.pem; - # ssl_certificate_key /etc/ssl/nginx/nginx.key; - - # access_log /var/log/nginx/localhost.ssl_access_log main; - # error_log /var/log/nginx/localhost.ssl_error_log info; - - # root /var/www/localhost/htdocs; - #} -} diff --git a/www-servers/nginx/files/nginx.initd-r2 b/www-servers/nginx/files/nginx.initd-r2 deleted file mode 100644 index 9cd04bedf63f..000000000000 --- a/www-servers/nginx/files/nginx.initd-r2 +++ /dev/null @@ -1,89 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -extra_commands="configtest" -extra_started_commands="upgrade reload" - -description="Robust, small and high performance http and reverse proxy server" -description_configtest="Run nginx' internal config check." -description_upgrade="Upgrade the nginx binary without losing connections." -description_reload="Reload the nginx configuration without losing connections." - -nginx_config=${nginx_config:-/etc/nginx/nginx.conf} - -command="/usr/sbin/nginx" -command_args="-c ${nginx_config}" -pidfile=${pidfile:-/run/nginx.pid} -user=${user:-nginx} -group=${group:-nginx} - -depend() { - need net - use dns logger netmount -} - -start_pre() { - if [ "${RC_CMD}" != "restart" ]; then - configtest || return 1 - fi -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ]; then - configtest || return 1 - fi -} - -stop_post() { - rm -f ${pidfile} -} - -reload() { - configtest || return 1 - ebegin "Refreshing nginx' configuration" - kill -HUP `cat ${pidfile}` &>/dev/null - eend $? "Failed to reload nginx" -} - -upgrade() { - configtest || return 1 - ebegin "Upgrading nginx" - - einfo "Sending USR2 to old binary" - kill -USR2 `cat ${pidfile}` &>/dev/null - - einfo "Sleeping 3 seconds before pid-files checking" - sleep 3 - - if [ ! -f ${pidfile}.oldbin ]; then - eerror "File with old pid not found" - return 1 - fi - - if [ ! -f ${pidfile} ]; then - eerror "New binary failed to start" - return 1 - fi - - einfo "Sleeping 3 seconds before WINCH" - sleep 3 ; kill -WINCH `cat ${pidfile}.oldbin` - - einfo "Sending QUIT to old binary" - kill -QUIT `cat ${pidfile}.oldbin` - - einfo "Upgrade completed" - eend $? "Upgrade failed" -} - -configtest() { - ebegin "Checking nginx' configuration" - ${command} -c ${nginx_config} -t -q - - if [ $? -ne 0 ]; then - ${command} -c ${nginx_config} -t - fi - - eend $? "failed, please correct errors above" -} diff --git a/www-servers/nginx/files/rtmp-nginx-1.11.0.patch b/www-servers/nginx/files/rtmp-nginx-1.11.0.patch deleted file mode 100644 index 36c9c03ff2b4..000000000000 --- a/www-servers/nginx/files/rtmp-nginx-1.11.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 965523f3970e449e3abbaa6c9b0db1ce251f2b68 Mon Sep 17 00:00:00 2001 -From: RocFang <fangpeng1986@gmail.com> -Date: Mon, 30 May 2016 22:56:16 +0800 -Subject: [PATCH] compile with nginx-1.11.0 - -From https://github.com/arut/nginx-rtmp-module/issues/820 - ---- - ngx_rtmp_core_module.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/ngx_rtmp_core_module.c b/ngx_rtmp_core_module.c -index 643702f..567f011 100644 ---- a/ngx_rtmp_core_module.c -+++ b/ngx_rtmp_core_module.c -@@ -557,7 +557,11 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) - break; - } - -+#if (nginx_version >= 1011000) -+ if (ngx_memcmp(ls[i].sockaddr + off, &u.sockaddr + off, len) != 0) { -+#else - if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) { -+#endif - continue; - } - -@@ -577,7 +581,11 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) - - ngx_memzero(ls, sizeof(ngx_rtmp_listen_t)); - -+#if (nginx_version >= 1011000) -+ ngx_memcpy(ls->sockaddr, &u.sockaddr, u.socklen); -+#else - ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen); -+#endif - - ls->socklen = u.socklen; - ls->wildcard = u.wildcard; |