* bug #173209

(Portage version: 2.1.2.4)

4 files changed, 92 insertions, 4 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 034edbe78478..9535fbb53722 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.140 2007/04/20 21:27:21 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.141 2007/04/21 14:54:04 voxus Exp $
+
+*nginx-0.5.18-r1 (21 Apr 2007)
+
+  21 Apr 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +files/nginx.conf-r4, -nginx-0.5.18.ebuild, +nginx-0.5.18-r1.ebuild:
+  Closing bug #173209.
 
 *nginx-0.5.18 (20 Apr 2007)
 
diff --git a/www-servers/nginx/files/digest-nginx-0.5.18 b/www-servers/nginx/files/digest-nginx-0.5.18-r1
index 36494e6e767d..36494e6e767d 100644
--- a/www-servers/nginx/files/digest-nginx-0.5.18
+++ b/www-servers/nginx/files/digest-nginx-0.5.18-r1
diff --git a/www-servers/nginx/files/nginx.conf-r4 b/www-servers/nginx/files/nginx.conf-r4
new file mode 100644
index 000000000000..117c2e55345f
--- /dev/null
+++ b/www-servers/nginx/files/nginx.conf-r4
@@ -0,0 +1,72 @@
+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 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;
+	# }
+}
diff --git a/www-servers/nginx/nginx-0.5.18.ebuild b/www-servers/nginx/nginx-0.5.18-r1.ebuild
index ca4839e4f7fb..1a42aabdc8ce 100644
--- a/www-servers/nginx/nginx-0.5.18.ebuild
+++ b/www-servers/nginx/nginx-0.5.18-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.18.ebuild,v 1.1 2007/04/20 21:27:21 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.18-r1.ebuild,v 1.1 2007/04/21 14:54:04 voxus Exp $
 
-inherit eutils
+inherit eutils ssl-cert
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
@@ -74,7 +74,17 @@ src_install() {
 	cp ${FILESDIR}/nginx-r1 ${T}/nginx
 	doinitd ${T}/nginx
 
-	cp ${FILESDIR}/nginx.conf-r3 conf/nginx.conf
+	cp ${FILESDIR}/nginx.conf-r4 conf/nginx.conf
+
+	use ssl && {
+		if [ ! -f /etc/ssl/${PN}/${PN}.key ]; then
+			dodir /etc/ssl/${PN}
+			insinto /etc/ssl/${PN}
+			docert ${PN}
+		fi
+
+		sed -e 's:# ::' -i conf/nginx.conf
+	}
 
 	dodir /etc/${PN}
 	insinto /etc/${PN}