Update Release Candidate

component/golang/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../gcc/buildout.cfg
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ./buildout.hash.cfg
 
 parts = gowork go
 
@@ -102,6 +103,13 @@ environment-extra =
 #   [gowork]
 #   buildflags = -race
 #
+# - If some environment variables are needed during the build, they can be
+#   added with environment option, e.g. this way:
+#
+#   [gowork]
+#   environment =
+#     CGO_ENABLED = 1
+#     FOO = bar
 #
 # Users can also add `install` field to [gowork] to request Go programs to be
 # automatically installed, for example:
@@ -142,6 +150,9 @@ cpkgpath =
 # by default don't `go install` anything
 install =
 
+# empty key=value environment by default
+environment =
+
 # everything is done by dependent parts
 recipe  = plone.recipe.command
 command = :
@@ -151,10 +162,9 @@ env.sh  = ${gowork-env.sh:output}
 
 [gowork-env.sh]
 recipe	= slapos.recipe.template
-url     = ${:_profile_base_location_}/goenv.sh.in
+url     = ${:_profile_base_location_}/${:filename}
 output	= ${gowork.dir:directory}/env.sh
 depends = ${gowork.dir:recipe}
-md5sum	= 6efdf5d63381c240c7d206d7939a63f7
 
 [gowork.dir]
 directory = ${buildout:directory}/go.work
@@ -172,7 +182,8 @@ stop-on-error = true
 # clients can put program list to install to gowork:install
 [gowork.goinstall]
 recipe  = plone.recipe.command
-command = bash -c ". ${gowork:env.sh} &&
+command = bash -c ". ${gowork:env.sh}
+	set -e
 	for x in $(echo -n '${gowork:install}' |tr '\n' ' '); do
 		case "\$x" in
 

component/golang/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+
+[gowork-env.sh]
+filename = goenv.sh.in
+md5sum = f6d0fc24e3f08f27bc2bd85003ca5ec2

component/golang/goenv.sh.in

@@ -2,6 +2,17 @@
 # Usage: env.sh [/path/to/env.sh]
 
 # ---- 8< ---- (buildout substitution here)
+# extend environment
+while read x ; do
+  k=$(echo $x | cut -d '=' -f 1  | sed -e 's/[[:space:]]*$//' )
+  v=$(echo $x | cut -d '=' -f 2- | sed -e 's/^[[:space:]]*//' )
+  if [ -n "$k" ]
+    then export $k="$v"
+  fi
+done <<-EOF
+  ${gowork:environment}
+EOF
+
 # PATH so that go & friends work out of the box
 export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gcc:prefix}/bin:$PATH
 X=${gowork:directory}

component/jq/buildout.cfg

+[buildout]
+parts =
+  jq
+extends =
+  ../oniguruma/buildout.cfg
+
+[jq]
+recipe = slapos.recipe.cmmi
+url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
+md5sum = e68fbd6a992e36f1ac48c99bbf825d6b
+shared = true
+configure-options =  
+  --with-oniguruma=${oniguruma:location}
+

component/oniguruma/buildout.cfg

+[buildout]
+parts =
+  oniguruma
+
+[oniguruma]
+recipe = slapos.recipe.cmmi
+url = https://github.com/kkos/oniguruma/releases/download/v6.9.6/onig-6.9.6.tar.gz
+md5sum = 4759064e1a6c23e764fa6918c700ecbd
+shared = true

software/grafana/gowork.cfg

-# Code generated by gowork-snapshot; DO NOT EDIT.
-
-# list of go git repositories to fetch
-[gowork.goinstall]
-depends_gitfetch  =
-    ${go_github.com_golang_dep:recipe}
-    ${go_github.com_grafana_grafana:recipe}
-    ${go_github.com_grafana_loki:recipe}
-    ${go_github.com_influxdata_influxdb:recipe}
-    ${go_github.com_influxdata_telegraf:recipe}
-
-
-[go_github.com_golang_dep]
-<= go-git-package
-go.importpath = github.com/golang/dep
-repository    = https://github.com/golang/dep
-revision      = 1f7c19e5f5
-
-[go_github.com_grafana_grafana]
-<= go-git-package
-go.importpath = github.com/grafana/grafana
-repository    = https://github.com/grafana/grafana
-revision      = v7.4.3-0-g010f20c1c8
-
-[go_github.com_grafana_loki]
-<= go-git-package
-go.importpath = github.com/grafana/loki
-repository    = https://github.com/grafana/loki
-revision      = v2.1.0-188-g877f524c36
-
-[go_github.com_influxdata_influxdb]
-<= go-git-package
-go.importpath = github.com/influxdata/influxdb
-repository    = https://github.com/influxdata/influxdb
-revision      = v1.8.4-0-gbc8ec4384e
-
-[go_github.com_influxdata_telegraf]
-<= go-git-package
-go.importpath = github.com/influxdata/telegraf
-repository    = https://github.com/influxdata/telegraf
-revision      = v1.17.3-0-g24a552b90b

software/grafana/software.cfg

@@ -8,7 +8,6 @@ extends =
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
   buildout.hash.cfg
-  gowork.cfg
 
 versions = versions
 parts =
@@ -31,84 +30,73 @@ part = python3
 [yarn]
 <= yarn-1.22.10
 
+
+[go_github.com_grafana_grafana]
+<= go-git-package
+go.importpath = github.com/grafana/grafana
+repository    = https://github.com/grafana/grafana
+revision      = v7.4.3-0-g010f20c1c8
+
+[go_github.com_grafana_loki]
+<= go-git-package
+go.importpath = github.com/grafana/loki
+repository    = https://github.com/grafana/loki
+revision      = v2.1.0-188-g877f524c36
+
+[go_github.com_influxdata_influxdb]
+<= go-git-package
+go.importpath = github.com/influxdata/influxdb
+repository    = https://github.com/influxdata/influxdb
+revision      = v1.8.4-0-gbc8ec4384e
+
+[go_github.com_influxdata_telegraf]
+<= go-git-package
+go.importpath = github.com/influxdata/telegraf
+repository    = https://github.com/influxdata/telegraf
+revision      = v1.17.3-0-g24a552b90b
+
+
 [gowork]
-# All the softwares installed in the go workspace have "non standard" installation
-# methods, so we install them in specific parts with custom commands.
-# They will be installed because they are dependencies of ${gowork.goinstall}
 install =
+  ${go_github.com_grafana_loki:location}:./cmd/loki
+  ${go_github.com_grafana_loki:location}:./cmd/promtail
+  ${go_github.com_influxdata_telegraf:location}:./cmd/...
+  ${go_github.com_influxdata_influxdb:location}:./cmd/...
+
+# use recent go
+golang = ${golang1.16:location}
+
+# disable cgo, to prevent loki/promtail from using go-systemd
+environment =
+  CGO_ENABLED = 0
 
 telegraf-bin = ${:bin}/telegraf
 influx-bin = ${:bin}/influx
 influxd-bin = ${:bin}/influxd
 grafana-bin = ${:bin}/grafana-server
-grafana-homepath = ${go_github.com_grafana_grafana:location}
+grafana-homepath = ${grafana:homepath}
 loki-bin = ${:bin}/loki
 promtail-bin = ${:bin}/promtail
 
-# use recent go
-golang  = ${golang1.16:location}
-
-[gowork.goinstall]
-command = :
-depends =
-   ${influxdb-install:recipe}
-   ${telegraf-install:recipe}
-   ${grafana-install:recipe}
-   ${loki-install:recipe}
-   ${promtail-install:recipe}
-
-[influxdb-install]
-<= gowork.goinstall
-command = bash -c ". ${gowork:env.sh} && \
-   go install -v github.com/golang/dep/cmd/dep && \
-   cd ${gowork:directory}/src/github.com/influxdata/influxdb && \
-   go install ./..."
-update-command =
-
-[telegraf-install]
-<= gowork.goinstall
-command = bash -c ". ${gowork:env.sh} && \
-   go install -v github.com/golang/dep/cmd/dep && \
-   cd ${gowork:directory}/src/github.com/influxdata/telegraf && \
-   ${make:location}/bin/make &&
-   cp telegraf ${gowork:bin}"
-update-command =
-
-[grafana-install]
-<= gowork.goinstall
-command = bash -c ". ${gowork:env.sh} && \
-   cd ${gowork:directory}/src/github.com/grafana/grafana && \
-   go run build.go setup && \
-   go run build.go build && \
-   ${yarn:location}/bin/yarn install --pure-lockfile && \
-   ${yarn:location}/bin/yarn run build && \
-   ${yarn:location}/bin/yarn run plugins:build-bundled && \
-   # Cleanup yarn and Cypress caches
-   rm -rf ${buildout:directory}/.cache/Cypress/ && \
-   rm -rf ${buildout:directory}/.cache/yarn/
-   "
-update-command =
-
-[loki-install]
-<= gowork.goinstall
-# loki also uses nodejs
-command = bash -c "export PATH=${nodejs:location}/bin/:$PATH && \
-   . ${gowork:env.sh} && \
-   go install -v github.com/golang/dep/cmd/dep && \
-   cd ${gowork:directory}/src/github.com/grafana/loki && \
-   go install ./cmd/loki"
-update-command =
-
-[promtail-install]
-<= gowork.goinstall
-# CGO_ENABLED is to disable systemd support (did not compile in my case)
-command = bash -c "export CGO_ENABLED=0 && \
-   . ${gowork:env.sh} && \
-   go install -v github.com/golang/dep/cmd/dep && \
-   cd ${gowork:directory}/src/github.com/grafana/loki && \
-   go install ./cmd/promtail"
-update-command =
 
+[grafana]
+recipe = plone.recipe.command
+command = bash -c "
+  cd ${:homepath} &&
+  . ${gowork:env.sh} &&
+  # Unlike the loki, grafana _needs_ CGO_ENABLED, so we override here
+  export CGO_ENABLED=1 &&
+  go run build.go setup && \
+  go run build.go build && \
+  ${yarn:location}/bin/yarn install --pure-lockfile && \
+  ${yarn:location}/bin/yarn run build && \
+  ${yarn:location}/bin/yarn run plugins:build-bundled && \
+  # Cleanup yarn and Cypress caches
+  rm -rf ${buildout:directory}/.cache/Cypress/ && \
+  rm -rf ${buildout:directory}/.cache/yarn/
+  "
+homepath = ${go_github.com_grafana_grafana:location}
+stop-on-error = true
 
 [download-file-base]
 recipe = slapos.recipe.build:download

software/html5as/buildout.hash.cfg

@@ -21,7 +21,7 @@ md5sum = 8a1383f7508a911c0c2d81445b5d4250
 
 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = 44a0f9f0a7682e800e56d8ece60b46b4
+md5sum = ec808dba866d85f7d37b85d75c13df2b
 
 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in

software/html5as/instance_html5as.cfg.in

@@ -182,6 +182,7 @@ monitor-httpd-port = 8197
 <= logrotate-entry-base
 name = nginx
 log = ${html5as:path_access_log} ${html5as:path_error_log}
+post = kill -USR1 $(cat ${html5as:path_pid})
 
 # Publish nginx address
 [publish-connection-information]
@@ -191,6 +192,34 @@ recipe = slapos.cookbook:publish
 <= monitor-publish
 server_url = ${html5as:access_url}
 title = Title ${slap-parameter:title}!
+# Add dependency to the promise so that frontend sections are processed
+# and there is no need to declare the new part in buildout:parts
+server-cdn-url = ${html5as-frontend-promise:url}
+
+# Request a CDN entry to master
+[html5as-frontend]
+# Extend slap-connnection to get the credentials for the request
+<= slap-connection
+# Recipe used to make requests
+recipe = slapos.cookbook:requestoptional
+name = HTM5AS frontend
+# Specify the software url of the frontend software release
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+# It is not a dedicated instance but an instance allocated on a shared instance
+slave = true
+config-url = ${html5as:access_url}
+config-https-only = true
+# The parameter expected to be received from the request are listed here.
+return = domain secure_access
+
+# Add a promise to make sure the cdn is properly configured
+[html5as-frontend-promise]
+<= monitor-promise-base
+module = check_url_available
+name = html5as-http-frontend.py
+url = ${html5as-frontend:connection-secure_access}
+config-url = ${:url}
+config-check-secure = 1
 
 [slap-parameter]
 title =

software/repman/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance.cfg]
 filename = instance.cfg.in
-md5sum = fd0df2c4a91c1e478b72cbaeb6c021c3
+md5sum = 8a08be95a04f1a47098c4fdef80bdfed
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in

software/repman/instance.cfg.in

@@ -46,7 +46,7 @@ context =
 
 # program binaries
     raw bash_bin                {{ bash_location }}/bin/bash
-    raw jq_bin                  {{ jq_location }}/jq
+    raw jq_bin                  {{ jq_location }}/bin/jq
     raw curl_bin                {{ curl_location }}/bin/curl
 
     ${:extra-context}

software/repman/software.cfg

@@ -17,6 +17,7 @@ extends =
   ../../component/proxysql/buildout.cfg
   ../../component/socat/buildout.cfg
   ../../component/rsync/buildout.cfg
+  ../../component/jq/buildout.cfg
   ../../stack/supervisord/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../neoppod/software-common.cfg
@@ -50,7 +51,7 @@ context =
     key buildout_bin_directory buildout:bin-directory
     key dbjobs_in dbjobs-in:target
     key dash_location dash:location
-    key jq_location jq-binary:location
+    key jq_location jq:location
     key logrotate_cfg template-logrotate-base:rendered
     key gowork_bin gowork:bin
     key gzip_location gzip:location
@@ -87,14 +88,6 @@ context =
     key proxysql_location proxysql:location
 
 
-[jq-binary]
-recipe = hexagonit.recipe.download
-url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
-md5sum = 1fffde9f3c7944f063265e9a5e67ae4f
-filename = jq
-mode = 0755
-download-only = true
-
 [download-file]
 recipe  = slapos.recipe.build:download
 url     = ${:_profile_base_location_}/${:_update_hash_filename_}

software/theia/software.cfg

@@ -294,11 +294,8 @@ mode = 0644
 
 
 [gowork]
-golang = ${golang1.14:location}
-
-[gowork.goinstall]
-command =
-  bash -c ". ${gowork:env.sh} && GO111MODULE=on go get golang.org/x/tools/gopls@v0.4.3 && cd ${go_github.com_caddyserver_caddy:location} && GO111MODULE=on go install -v github.com/caddyserver/caddy/..."
+install +=
+   golang.org/x/tools/gopls@v0.6.6
 
 
 [cli-utilities]