From bde0eb835a75d9f803d9886c907c78d9163893b9 Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Wed, 4 Nov 2009 12:11:50 +0100 Subject: [PATCH] logrotate script and cache dir --- www-servers/nginx/Manifest | 9 ++-- www-servers/nginx/files/nginx.conf | 66 ------------------------- www-servers/nginx/files/nginx.conf-r1 | 55 --------------------- www-servers/nginx/files/nginx.conf-r2 | 58 ---------------------- www-servers/nginx/files/nginx.conf-r3 | 57 --------------------- www-servers/nginx/files/nginx.conf-r4 | 27 +--------- www-servers/nginx/files/nginx.logrotate | 11 +++++ www-servers/nginx/nginx-0.8.21.ebuild | 5 +- 8 files changed, 20 insertions(+), 268 deletions(-) delete mode 100644 www-servers/nginx/files/nginx.conf delete mode 100644 www-servers/nginx/files/nginx.conf-r1 delete mode 100644 www-servers/nginx/files/nginx.conf-r2 delete mode 100644 www-servers/nginx/files/nginx.conf-r3 create mode 100644 www-servers/nginx/files/nginx.logrotate diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index a75a0d1..0f313c6 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,12 +1,9 @@ AUX nginx 994 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb SHA1 de0a11802cc6f4a1111652416bce131a07ae008c SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd AUX nginx-r1 1645 RMD160 d032feec43e4ba31ac5b6fffec478ebbeb49db60 SHA1 49f0db3efaccd3cef545b8c68cfa557ca829352f SHA256 b263a663399d2897dfdf53226d45fc3707bc9230bd687b8003d075a48f60ecaf AUX nginx-secure-link-timeout.patch 3103 RMD160 51337d222001fb051d29feaac3f68ab8367357da SHA1 d9f831bc7c378e2c1893a5f9964400a49ecc4f4b SHA256 ff89688109e695c7e3c8dfd39fa7e1310984d790e59bbbf40f29987d3edfd0a5 -AUX nginx.conf 1400 RMD160 d982c853d9145643c4a885012a41fc4acd39080f SHA1 6974ab2214a11ad3e828861b47f9499c9481520d SHA256 11adbf9f0903f473b98474d460e41ec1161daa58d37e5c05019b03eae4d944f7 -AUX nginx.conf-r1 966 RMD160 b4b9e54860f14a106b186cfc02dbb00e15df694d SHA1 0bc417a8b7f736bcfba5330a48b7915ef344a7a2 SHA256 ef34ceb24bdd8aebf144b9583f457e3bfbbd96286acc4394c159a886990c29bf -AUX nginx.conf-r2 1044 RMD160 5ddc034f31a54da00b57503cfc5a7e0be2189cef SHA1 988e59f8aeabb8b4b1e412f4dfc8ddfa96ee5da4 SHA256 722b5588c975c523caea14bd90866be5d260f7d0fcdf1af90d2110b2db7ee448 -AUX nginx.conf-r3 1039 RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c SHA1 5ddb38fd85e1a99f69b5efc62b22a4633c924f67 SHA256 93c926f698a21946687340d553d584c47408359d5bb64651fc967274659662fc -AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836c85e98e3b2c633818c286992d32a68c0b5ff SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6 +AUX nginx.conf-r4 878 RMD160 9515d77df5ce3f56e7bb06c7274b0b22b1f5a7c2 SHA1 83e00d5a575057f48a13be7c44926ea578a6c4b7 SHA256 c827c2d28959f14ee7ebb1ba9e88071ff8203228df6b24da9ee94ee4ec669fcc +AUX nginx.logrotate 195 RMD160 56a165a6a42355f36f2d125318105708dfb948e1 SHA1 19cfc313d815c57c64df55282ae627c11280a6a6 SHA256 16fcd09e7c62b5693a4eed0924494c9794cd2e86d0e0f4d2d77519b75bf69bb6 DIST nginx-0.8.21.tar.gz 609931 RMD160 a00d377ba117a0d6182da5258d3742c07b53d51b SHA1 6c34b8d432081b783f2215e1cbe08e2481522aad SHA256 857c6708b48a177a8bc09d3e53e1518ed0bdf4b7f690188f3b219b0c14e3f6a5 DIST ngx_http_auth_pam_module-1.1.tar.gz 5193 RMD160 38437a1f5d34f93b22abb9f0a7181be756356d33 SHA1 d04065a512169925dda8bce710e1dc5012cac47b SHA256 ea9da5f106b952729398248cddabbe25f7a5752993e91c9b8252dbc2b03b8ecd -EBUILD nginx-0.8.21.ebuild 3841 RMD160 6753eb0134cd4c450a65019162447b5b9c8efa11 SHA1 b21407025167a3c702af5bbe39e82c274d305d2e SHA256 54b71a09b5c3babaef0351ed5b6ec73231b7c6e324f0f85b55dd5541fa35cce5 +EBUILD nginx-0.8.21.ebuild 3936 RMD160 d667ddafa9ee2edd169d93f1c580f3bb31b0e734 SHA1 5d5278f8e28d3dfaf9a9e1ef96b399d5a8baa224 SHA256 3e1dcb9b21f03c4003853abf670b68f28df0f91afbad6c0faf109724cd95411c MISC metadata.xml 711 RMD160 c2426ecf2ca328c1822edcd4fe4e1eb5ba9176c0 SHA1 0b9ea8e217537e7255a9bdd2f5668198c738cf09 SHA256 d3b05c228dd62148c8bc7e46abad586eb9a9f3061ef510e1ed0a4baa77595a99 diff --git a/www-servers/nginx/files/nginx.conf b/www-servers/nginx/files/nginx.conf deleted file mode 100644 index 526dd2e..0000000 --- a/www-servers/nginx/files/nginx.conf +++ /dev/null @@ -1,66 +0,0 @@ -user apache apache; - -worker_processes 5; - -error_log /var/log/nginx/error_log warn; - -events { - connections 2048; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '%addr - - [%time] "%request" %status ' - '%length "%{Referer}i" "%{User-Agent}i" '; - - log_format download '%addr - - [%time] "%request" %status ' - '%length "%{Referer}i" "%{User-Agent}i" ' - '"%{Range}i" "%{Content-Range}o"'; - - post_accept_timeout 60; - client_header_timeout 3m; - client_body_timeout 3m; - send_timeout 3m; - - 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; - - server { - listen 80; - - charset on; - source_charset koi8-r; - - access_log /var/log/nginx/access_log main; - - location / { - root /var/www/localhost/htdocs; - index index.html; - allow all; - } - - location ~* ^.+\.(jpg|jpeg|gif)$ { - root /var/www/localhost/htdocs; - access_log off; - expires 30d; - } - } -} diff --git a/www-servers/nginx/files/nginx.conf-r1 b/www-servers/nginx/files/nginx.conf-r1 deleted file mode 100644 index 4ad6a3c..0000000 --- a/www-servers/nginx/files/nginx.conf-r1 +++ /dev/null @@ -1,55 +0,0 @@ -user apache apache; - -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 8192; - 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; - - server { - listen 127.0.0.1; - server_name localhost; - - access_log /var/log/nginx/access_log info; - - root /var/www/localhost/htdocs; - } -} diff --git a/www-servers/nginx/files/nginx.conf-r2 b/www-servers/nginx/files/nginx.conf-r2 deleted file mode 100644 index 913e98f..0000000 --- a/www-servers/nginx/files/nginx.conf-r2 +++ /dev/null @@ -1,58 +0,0 @@ -user apache apache; - -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 8192; - 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; - - root /var/www/localhost/htdocs; - } -} diff --git a/www-servers/nginx/files/nginx.conf-r3 b/www-servers/nginx/files/nginx.conf-r3 deleted file mode 100644 index a924424..0000000 --- a/www-servers/nginx/files/nginx.conf-r3 +++ /dev/null @@ -1,57 +0,0 @@ -user nginx nginx; -worker_processes 1; - -error_log /var/log/nginx/error_log info; - -events { - worker_connections 8192; - 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; - - root /var/www/localhost/htdocs; - } -} diff --git a/www-servers/nginx/files/nginx.conf-r4 b/www-servers/nginx/files/nginx.conf-r4 index 117c2e5..208dd92 100644 --- a/www-servers/nginx/files/nginx.conf-r4 +++ b/www-servers/nginx/files/nginx.conf-r4 @@ -4,7 +4,7 @@ worker_processes 1; error_log /var/log/nginx/error_log info; events { - worker_connections 8192; + worker_connections 1024; use epoll; } @@ -45,28 +45,5 @@ http { 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 portion - # 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; - # } + include /etc/nginx/vhosts.d/*.conf; } diff --git a/www-servers/nginx/files/nginx.logrotate b/www-servers/nginx/files/nginx.logrotate new file mode 100644 index 0000000..50c2af1 --- /dev/null +++ b/www-servers/nginx/files/nginx.logrotate @@ -0,0 +1,11 @@ +# nginx logrotate snipet for Gentoo Linux + +/var/log/nginx/*.log { + rotate 52 + weekly + notifempty + sharedscripts + postrotate + /etc/init.d/nginx reload > /dev/null 2>&1 || true + endscript +} diff --git a/www-servers/nginx/nginx-0.8.21.ebuild b/www-servers/nginx/nginx-0.8.21.ebuild index 90a6fc2..955b405 100644 --- a/www-servers/nginx/nginx-0.8.21.ebuild +++ b/www-servers/nginx/nginx-0.8.21.ebuild @@ -92,7 +92,7 @@ src_compile() { } src_install() { - keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} + keepdir /var/{log,cache}/${PN} /var/tmp/${PN}/{client,proxy,fastcgi} dosbin objs/nginx cp "${FILESDIR}"/nginx-r1 "${T}"/nginx @@ -106,6 +106,9 @@ src_install() { dodoc CHANGES{,.ru} README + dodir /etc/logrotate.d + cp "${FILESDIR}"/nginx.logrotate ${D}/etc/logrotate.d/nginx + use perl && { cd "${S}"/objs/src/http/modules/perl/ einstall DESTDIR="${D}"|| die "failed to install perl stuff"