From e50e0f730ba014ff21e35d13578d9c2e6edd87d1 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Mon, 11 Sep 2017 14:53:41 +0200
Subject: [PATCH] Make nginx listen on :: for ipv6

---
 setup/start/nginx/appconfig.ejs | 2 ++
 setup/start/nginx/nginx.conf    | 1 +
 src/infra_version.js            | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup/start/nginx/appconfig.ejs b/setup/start/nginx/appconfig.ejs
index b752145de..b7e4058fb 100644
--- a/setup/start/nginx/appconfig.ejs
+++ b/setup/start/nginx/appconfig.ejs
@@ -7,9 +7,11 @@ map $http_upgrade $connection_upgrade {
 server {
 <% if (vhost) { %>
     listen       443 http2;
+    listen       [::]:443 http2;
     server_name  <%= vhost %>;
 <% } else { %>
     listen       443 http2 default_server;
+    listen       [::]:443 http2 default_server;
 <% } %>
 
     ssl                  on;
diff --git a/setup/start/nginx/nginx.conf b/setup/start/nginx/nginx.conf
index cd4082bcf..9d2a12a26 100644
--- a/setup/start/nginx/nginx.conf
+++ b/setup/start/nginx/nginx.conf
@@ -39,6 +39,7 @@ http {
     # HTTP server
     server {
         listen      80;
+        listen      [::]:80;
 
         # collectd
         location /nginx_status {
diff --git a/src/infra_version.js b/src/infra_version.js
index 8a06904b4..067e668bf 100644
--- a/src/infra_version.js
+++ b/src/infra_version.js
@@ -7,7 +7,7 @@
 exports = module.exports = {
     // a major version makes all apps restore from backup
     // a minor version makes all apps re-configure themselves
-    'version': '48.5.0',
+    'version': '48.6.0',
 
     'baseImages': [ 'cloudron/base:0.10.0' ],