gentoo resync : 14.07.2018

1 files changed, 8 insertions, 21 deletions

diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
index ccca5dd2de51..23f2d76d51ee 100644
--- a/www-servers/h2o/files/h2o.conf
+++ b/www-servers/h2o/files/h2o.conf
@@ -1,30 +1,17 @@
-# see /usr/share/doc/h2o/index.html for detailed documentation
-# see h2o --help for command-line options and settings
-
 user: h2o
 pid-file: /run/h2o.pid
 access-log: /var/log/h2o/access.log
 error-log: /var/log/h2o/error.log
 
-# httpoxy mitigation (https://httpoxy.org)
-# see https://github.com/h2o/h2o/pull/996
-setenv:
-  HTTP_PROXY: ""
-
-listen: 80
-
-#listen:
-#  port: 443
-#    ssl:
-#      minimum-version: TLSv1.2
-#      certificate-file: /etc/h2o/server.crt
-#      key-file: /etc/h2o/server.key
-
 hosts:
-  "localhost:80":
+  "localhost":
+    listen:
+      port: 80
+    listen:
+      port: 443
+      ssl:
+        certificate-file: /etc/ssl/h2o/server.crt
+        key-file: /etc/ssl/h2o/server.key
     paths:
       "/":
         file.dir: /var/www/localhost/htdocs
-      "/doc":
-        file.dir: /usr/share/doc/h2o/
-        file.index: [ 'index.html' ]