Commit dcde22f1 authored by Jérome Perrin's avatar Jérome Perrin

fixup! trestic rest-server

parent acf628d1
......@@ -15,4 +15,4 @@
[instance.cfg.in]
filename = instance.cfg.in
md5sum = 3d9204a7b4a46ee0e3003d110678e89a
md5sum = ed07f590c8edfbe74a2bb5f6b1f80ee6
......@@ -41,26 +41,27 @@ promise = ${:etc}/promise
rest-server-data-dir = ${:srv}/restic
backup-caucased = ${:srv}/backup/caucased/
# macros
# Macros
[check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/${:_buildout_section_name_}
[check-url-available-promise]
recipe = slapos.cookbook:check_url_available
path = ${directory:promise}/${:_buildout_section_name_}
dash_path = {{ dash_bin }}
curl_path = {{ curl_bin }}
# Caucase
[rest-server-certificate]
# TODO: caucase
;recipe = plone.recipe.command
# command =
# if [ ! -e ${:key-file} ]
# then
# {{ openssl_bin }} req -x509 -nodes -days 3650 \
# -subj "/C=AA/ST=X/L=X/O=Dis/CN=${:common-name}" \
# -newkey rsa:1024 -keyout ${:key-file} \
# -out ${:cert-file}
# fi
;update-command = ${:command}
key-file = ${directory:etc}/${:_buildout_section_name_}.key
cert-file = ${directory:etc}/${:_buildout_section_name_}.crt
common-name = ${:_buildout_section_name_}
ca-file = ${directory:etc}/${:_buildout_section_name_}.ca.crt
crl-file = ${directory:etc}/${:_buildout_section_name_}.crl
{{ caucase.updater(
{{
caucase.updater(
prefix='rest-server-certificate',
buildout_bin_directory=buildout['bin-directory'],
updater_path='${directory:service}/rest-server-certificate-updater',
......@@ -70,11 +71,9 @@ crl-file = ${directory:etc}/${:_buildout_section_name_}.crl
ca_path='${rest-server-certificate:ca-file}',
crl_path='${rest-server-certificate:crl-file}',
key_path='${rest-server-certificate:key-file}',
template_csr='${rest-server-certificate-csr-XXX:csr}',
template_csr='${rest-server-certificate-prepare-csr:csr}',
openssl=openssl_bin,
)}}
#template_csr_pem='',
[rest-server-certificate-csr-config]
recipe = slapos.recipe.template:jinja2
......@@ -85,15 +84,16 @@ template = inline:
req_extensions = req_ext
distinguished_name = dn
[ dn ]
CN = restic-rest-server
[ req_ext ]
subjectAltName = @alt_names
#CN = restic-rest-server
CN = ${instance-parameter:ipv6-random}
#[ req_ext ]
#subjectAltName = @alt_names
[ alt_names ]
IP.1 = ${instance-parameter:ipv4-random}
IP.2 = ${instance-parameter:ipv6-random}
rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:_buildout_section_name_}.txt
[rest-server-certificate-csr-XXX]
[rest-server-certificate-prepare-csr]
recipe = plone.recipe.command
command =
if [ ! -f '${:csr}' ] ; then
......@@ -109,24 +109,14 @@ command =
stop-on-error = true
csr = ${directory:srv}/${:_buildout_section_name_}.csr.pem
# XXX this is macro
[check-port-listening-promise]
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/${:_buildout_section_name_}
[check-url-available-promise]
recipe = slapos.cookbook:check_url_available
path = ${directory:promise}/${:_buildout_section_name_}
dash_path = {{ dash_bin }}
curl_path = {{ curl_bin }}
[caucased]
port = 8080
ip = ${instance-parameter:ipv6-random}
netloc = [${:ip}]:${:port}
url = http://${:netloc}/
{{ caucase.caucased(
{{
caucase.caucased(
prefix='caucased',
buildout_bin_directory=buildout['bin-directory'],
caucased_path='${directory:service}/caucased',
......@@ -145,14 +135,15 @@ user = backup
[rest-server-htpassword]
recipe = plone.recipe.command
command =
# TODO: depend on apache
# TODO: test -f
htpasswd \
if [ ! -f '${:htpassword}' ] ; then
{{ htpasswd_bin }} \
-b \
-B \
-c ${directory:rest-server-data-dir}/.htpasswd \
-c ${:htpassword} \
${rest-server-password:user} \
${rest-server-password:passwd}
fi
htpassword = ${directory:rest-server-data-dir}/.htpasswd
stop-on-error = true
[rest-server]
......@@ -178,7 +169,6 @@ depends =
hostname= ${rest-server:ip}
port = ${rest-server:port}
[frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
......@@ -194,7 +184,6 @@ return = domain secure_access
url = ${frontend:connection-secure_access}
check-secure = 1
# XXX golang uses environ SSL_CERT_FILE
[promises]
recipe =
......
......@@ -6,7 +6,6 @@ extends =
../../component/dash/buildout.cfg
../../component/golang/buildout.cfg
../../component/restic/buildout.cfg
../../component/defaults.cfg
../../stack/caucase/buildout.cfg
../../stack/slapos.cfg
buildout.hash.cfg
......@@ -24,12 +23,6 @@ part = python3
[gowork]
install +=
${git.github.com_restic_rest-server:location}:./cmd/...
# package https://github.com/restic/rest-server@v0.10.0: can only use path@version syntax with 'go get'
#install +=
# github.com/restic/rest-server@v0.10.0
golang = ${golang1.16:location}
[git.github.com_restic_rest-server]
<= go-git-package
......@@ -46,12 +39,9 @@ context =
section buildout buildout
key gowork_bin gowork:bin
raw openssl_bin ${openssl:location}/bin/openssl
raw htpasswd_bin ${apache:location}/bin/htpasswd
raw dash_bin ${dash:location}/bin/dash
raw curl_bin ${curl:location}/bin/curl
key template_monitor monitor2-template:rendered
import-list =
file caucase caucase-jinja2-library:target
[gcc]
# XXX for development
max_version = 0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment