From f2ded16c1b28b471a5864aa7cfb96f68c44118f8 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 5 Sep 2012 15:13:10 +0000
Subject: [PATCH] - Fixed FS#2318 - Starting nginx nginx: [emerg] duplicate
listen options for [ipv6]:80
---
server/conf/nginx_vhost.conf.master | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index a5989531bd..0a73ce9c72 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -1,13 +1,13 @@
server {
listen <tmpl_var name='ip_address'>:80;
<tmpl_if name='ipv6_enabled'>
- listen [<tmpl_var name='ipv6_address'>]:80 ipv6only=on;
+ listen [<tmpl_var name='ipv6_address'>]:80;
</tmpl_if>
<tmpl_if name='ssl_enabled'>
listen <tmpl_var name='ip_address'>:443 ssl;
<tmpl_if name='ipv6_enabled'>
- listen [<tmpl_var name='ipv6_address'>]:443 ssl ipv6only=on;
+ listen [<tmpl_var name='ipv6_address'>]:443 ssl;
</tmpl_if>
ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
--
GitLab