www-servers/h2o: inherit ssl-cert

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/www-servers/h2o/files/h2o.conf b/www-servers/h2o/files/h2o.conf
index ccca5dd2de5168754c5dfd2ecae07d14409fada9..a135cc35735164d9934a3abac5def771c03c04a9 100644 (file)
--- a/www-servers/h2o/files/h2o.conf
+++ b/www-servers/h2o/files/h2o.conf
@@ -1,27 +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

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index 25c1690eeeb3b5648daf9165e86baa3d10633cb6..47d1794fa4aa3a84f5250e568c3e530fb771c20a 100644 (file)
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -3,9 +3,10 @@
 
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
 USE_RUBY="ruby23 ruby24"
 
-inherit cmake-utils ruby-single systemd toolchain-funcs user
+inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
@@ -88,3 +89,10 @@ src_install() {
        fowners ${PN}:${PN} /var/log/${PN}
        fperms 0750 /var/log/${PN}
 }
+
+pkg_postinst() {
+       if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+               install_cert /etc/ssl/${PN}/server
+               chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+       fi
+}

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 89f63062ca998c67c192bf69c1a103e0f59bb490..56f77212526f0637bfb1ea7e5c11fc1b05330a4a 100644 (file)
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -3,9 +3,10 @@
 
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
 USE_RUBY="ruby23 ruby24"
 
-inherit cmake-utils git-r3 ruby-single systemd toolchain-funcs user
+inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
@@ -85,3 +86,10 @@ src_install() {
        fowners ${PN}:${PN} /var/log/${PN}
        fperms 0750 /var/log/${PN}
 }
+
+pkg_postinst() {
+       if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+               install_cert /etc/ssl/${PN}/server
+               chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+       fi
+}