component/caddy: Upgrade to v1.0.0-beta1

This also means that caddy source is fetched directly from upstream, as all
required fixes has been incorporated into the upstream.

Since https://github.com/mholt/caddy/releases/tag/v0.11.4 TLS-SNI challenge
is replaced by ACME TLS-ALPN challenge, so switch has changed.

Drop direct usage of gowork for now, in order to have caddy built using go
module, support for gowork with go modules might come later.

component/caddy/buildout.cfg

 [buildout]
 extends =
   ../../component/golang/buildout.cfg
-  gowork.cfg
 
 parts =
-  gowork
   caddy
 
 [gowork]
+# Caddy 1.x+ uses go modules, for which gowork does not work yet
 golang  = ${golang1.12:location}
 install =
-  github.com/mholt/caddy
+
+[gowork.goinstall]
+command = :
+depends =
+  ${caddy:recipe}
 
 [caddy]
-recipe  = slapos.recipe.cmmi
-path    = ${go_github.com_mholt_caddy:location}
-go      = ${gowork:golang}/bin/go
-configure-command = :
-make-targets =
-make-binary = cd ${:path}/caddy  && ${:go} install -v
-environment =
-  PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
-  GOPATH=${gowork:directory}
+# revision and repository can be used to control which caddy version is used
+revision = v1.0.0-beta1
+repository = github.com/mholt/caddy/caddy
+
+recipe  = plone.recipe.command
+update-command = ${:command}
+stop-on-error = True
+# GO111MODULE=on enables go modules support
+# the chmod is needed as modules are fetched with u-w
+command =
+  . ${gowork:env.sh} &&
+  cd ${gowork:directory} &&
+  export GO111MODULE=on &&
+  go get ${:repository}@${:revision} &&
+  chmod -R u+w .
 output = ${gowork:bin}/caddy
+location = ${:output}

component/caddy/gowork.cfg

-# Code generated by gowork-snapshot; DO NOT EDIT.
-
-# list of go git repositories to fetch
-[gowork.goinstall]
-depends_gitfetch  =
-    ${go_github.com_mholt_caddy:recipe}
-
-
-[go_github.com_mholt_caddy]
-<= go-git-package
-go.importpath = github.com/mholt/caddy
-repository    = https://lab.nexedi.com/nexedi/caddy.git
-revision      = nxd-v0.11.1-5-gdd393ce3a67e6a773be87185528a00f2e0a9eb26

software/caddy-frontend/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 1d39842e07e6a8674f3157ffc3f7a042
+md5sum = 353e84c50dbecb20269e828f95f2a20d
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -30,7 +30,7 @@ md5sum = 37edefdb9963daa67b01e5d55d97c17d
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = e681b41535dcd676bb971743ad0bb27f
+md5sum = 61919290d810518eba2e74e821dc9de8
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 5597b2184b445af69ad6d517d0729ad6
+md5sum = cc6f32656e76f4b79b5e47567b930f74

software/caddy-frontend/instance-apache-frontend.cfg.in

@@ -364,7 +364,7 @@ command-line = {{ parameter_dict['caddy'] }}
 {% endif %}
   -grace {{ instance_parameter['configuration.mpm-graceful-shutdown-timeout'] }}s
   -disable-http-challenge
-  -disable-tls-sni-challenge
+  -disable-tls-alpn-challenge
 wrapper-path = ${directory:bin}/caddy-wrapper
 
 [caddy-frontend]
@@ -770,7 +770,7 @@ command-line = {{ parameter_dict['caddy'] }}
 {% endif %}
   -grace {{ instance_parameter['configuration.mpm-graceful-shutdown-timeout'] }}s
   -disable-http-challenge
-  -disable-tls-sni-challenge
+  -disable-tls-alpn-challenge
 wrapper-path = ${directory:bin}/nginx-wrapper
 
 [nginx-frontend]

software/caddy-frontend/instance-kedifa.cfg.in

@@ -159,7 +159,7 @@ command-line = {{ parameter_dict['caddy'] }}
   -log ${expose-csr_id-configuration:error-log}
   -http2=true
   -disable-http-challenge
-  -disable-tls-sni-challenge
+  -disable-tls-alpn-challenge
   -root ${directory:csr_id}
 
 wrapper-path = ${directory:service}/expose-csr_id

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -553,7 +553,7 @@ command-line = {{ caddy_executable }}
   -log ${expose-csr_id-configuration:error-log}
   -http2=true
   -disable-http-challenge
-  -disable-tls-sni-challenge
+  -disable-tls-alpn-challenge
   -root {{ directory_csr_id }}
 
 wrapper-path = {{ service_directory }}/expose-csr_id