Commit 3605f1a2 authored by Rafael Monnerat's avatar Rafael Monnerat

Update Release Candidate

parents b09507c4 6dbd5cca
...@@ -12,8 +12,8 @@ parts = haproxy ...@@ -12,8 +12,8 @@ parts = haproxy
[haproxy] [haproxy]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://www.haproxy.org/download/1.8/src/haproxy-1.8.1.tar.gz url = http://www.haproxy.org/download/1.8/src/haproxy-1.8.4.tar.gz
md5sum = e42892d4b6ee33200fccaa1d81837e49 md5sum = 540cd21169e8828d5d11894b2fa74ab4
configure-command = true configure-command = true
# If the system is running on Linux 2.6, we use "linux26" as the TARGET, # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# otherwise use "generic". # otherwise use "generic".
......
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '1.0.59' version = '1.0.60.dev0'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.rst").read() + "\n" + \ long_description = open("README.rst").read() + "\n" + \
open("CHANGES.rst").read() + "\n" open("CHANGES.rst").read() + "\n"
......
...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e ...@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
md5sum = 979eecabeaad0114fb24f65bf52f7e6a md5sum = b6a2c860ea1cd4bc9d185c7108c52d0a
[template-apache-replicate] [template-apache-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
......
...@@ -479,7 +479,6 @@ recipe = slapos.cookbook:wrapper ...@@ -479,7 +479,6 @@ recipe = slapos.cookbook:wrapper
command-line = ${trafficserver:location}/bin/traffic_line command-line = ${trafficserver:location}/bin/traffic_line
wrapper-path = $${directory:bin}/traffic_line wrapper-path = $${directory:bin}/traffic_line
environment = TS_ROOT=$${buildout:directory} environment = TS_ROOT=$${buildout:directory}
parameters-extra = true
[trafficserver-promise-cache-availability] [trafficserver-promise-cache-availability]
recipe = collective.recipe.template recipe = collective.recipe.template
...@@ -576,13 +575,11 @@ port = $${apache-configuration:ssl-cache-through-port} ...@@ -576,13 +575,11 @@ port = $${apache-configuration:ssl-cache-through-port}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${apache-configuration:pid-file} command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${apache-configuration:pid-file}
wrapper-path = $${directory:promise}/apache-frontend-is-running-actual-software-release wrapper-path = $${directory:promise}/apache-frontend-is-running-actual-software-release
parameters-extra = true
[promise-apache-mpm-watchdog] [promise-apache-mpm-watchdog]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/apache-mpm-watchdog --url http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u admin -p $${monitor-htpasswd:passwd} -d $${directory:run}/apache-mpm-watchdog.json command-line = ${buildout:bin-directory}/apache-mpm-watchdog --url http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u admin -p $${monitor-htpasswd:passwd} -d $${directory:run}/apache-mpm-watchdog.json
wrapper-path = $${directory:promise}/apache-mpm-watchdog wrapper-path = $${directory:promise}/apache-mpm-watchdog
parameters-extra = true
[slap_connection] [slap_connection]
...@@ -744,4 +741,3 @@ port = $${instance-parameter:configuration.plain_nginx_port} ...@@ -744,4 +741,3 @@ port = $${instance-parameter:configuration.plain_nginx_port}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${nginx-configuration:pid-file} command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${nginx-configuration:pid-file}
wrapper-path = $${directory:promise}/promise-nginx-is-process-older-than-dependency-set wrapper-path = $${directory:promise}/promise-nginx-is-process-older-than-dependency-set
parameters-extra = true
...@@ -19,4 +19,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0 ...@@ -19,4 +19,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
[template-cloudooo-instance] [template-cloudooo-instance]
filename = instance-cloudooo.cfg.in filename = instance-cloudooo.cfg.in
md5sum = b1e0c365b5cfffd86278daf39fb6de9f md5sum = 6ec2461e884761c56ef4ba928a8eede6
...@@ -285,4 +285,3 @@ environment = ...@@ -285,4 +285,3 @@ environment =
DISPLAY=:0 DISPLAY=:0
TMPDIR=${directory:run} TMPDIR=${directory:run}
command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver
parameters-extra = true
...@@ -28,14 +28,12 @@ host = $${instance-parameter:ipv6-random} ...@@ -28,14 +28,12 @@ host = $${instance-parameter:ipv6-random}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/dream_interpreter command-line = ${buildout:bin-directory}/dream_interpreter
wrapper-path = $${buildout:bin-directory}/dream_interpreter wrapper-path = $${buildout:bin-directory}/dream_interpreter
parameters-extra = true
# service # service
[dream_platform] [dream_platform]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/dream_platform --debug --host $${dream_platform_parameter:host} --port $${dream_platform_parameter:port} --log $${directory:log}/dream_platform.log command-line = ${buildout:bin-directory}/dream_platform --debug --host $${dream_platform_parameter:host} --port $${dream_platform_parameter:port} --log $${directory:log}/dream_platform.log
wrapper-path = $${directory:service}/dream_platform wrapper-path = $${directory:service}/dream_platform
parameters-extra = true
[grunt_watch] [grunt_watch]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -47,13 +45,11 @@ wrapper-path = $${directory:service}/dream_grunt_watch ...@@ -47,13 +45,11 @@ wrapper-path = $${directory:service}/dream_grunt_watch
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${buildout:bin-directory}/dream_simulation command-line = ${buildout:bin-directory}/dream_simulation
wrapper-path = $${directory:script}/dream_simulation wrapper-path = $${directory:script}/dream_simulation
parameters-extra = true
[dream_test_suite] [dream_test_suite]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${dream_testrunner:script} command-line = ${dream_testrunner:script}
wrapper-path = $${directory:script}/dream_test_suite wrapper-path = $${directory:script}/dream_test_suite
parameters-extra = true
[directory] [directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
......
...@@ -277,7 +277,6 @@ context-extra = ...@@ -277,7 +277,6 @@ context-extra =
[gitlab-bin] [gitlab-bin]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_} wrapper-path = ${directory:bin}/${:_buildout_section_name_}
parameters-extra = true
# NOTE $HOME needed to pick gitconfig # NOTE $HOME needed to pick gitconfig
environment = environment =
BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile BUNDLE_GEMFILE = {{ gitlab_repository_location }}/Gemfile
...@@ -285,8 +284,6 @@ environment = ...@@ -285,8 +284,6 @@ environment =
RAILS_ENV = production RAILS_ENV = production
SIDEKIQ_MEMORY_KILLER_MAX_RSS = ${instance-parameter:configuration.sidekiq_memory_killer_max_rss} SIDEKIQ_MEMORY_KILLER_MAX_RSS = ${instance-parameter:configuration.sidekiq_memory_killer_max_rss}
# NOTE sys.argv[1:] implicitly appended
# (by slapos.recipe.librecipe.execute.generic_exec() at runtime)
command-line = command-line =
{{ bundler_4gitlab }} exec sh -c {{ bundler_4gitlab }} exec sh -c
'cd ${gitlab-work:location} && ${:prog} "$@"' ${:prog} 'cd ${gitlab-work:location} && ${:prog} "$@"' ${:prog}
......
...@@ -328,7 +328,7 @@ md5sum = fb52f20f04b3c0bacd6a767dac9d6483 ...@@ -328,7 +328,7 @@ md5sum = fb52f20f04b3c0bacd6a767dac9d6483
[instance-gitlab.cfg.in] [instance-gitlab.cfg.in]
<= download-file <= download-file
md5sum = b05fad928ffbb689b4415837525c62d1 md5sum = fc67ab8bb6761fb3e2c56d46266a094c
[instance-gitlab-export.cfg.in] [instance-gitlab-export.cfg.in]
<= download-file <= download-file
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[instance-jupyter-notebook] [instance-jupyter-notebook]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = e287ff4ca6dbec019d8f1491e14c00b4 md5sum = 78625cff193d7fdadd57670d30bc9a0d
[jupyter-notebook-config] [jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja filename = jupyter_notebook_config.py.jinja
......
...@@ -69,7 +69,6 @@ command-line = ...@@ -69,7 +69,6 @@ command-line =
--notebook-dir=${instance-parameter:notebook_dir} --notebook-dir=${instance-parameter:notebook_dir}
--log-level="DEBUG" --log-level="DEBUG"
wrapper-path = ${directory:service}/jupyter-lab wrapper-path = ${directory:service}/jupyter-lab
parameters-extra = true
environment = environment =
JUPYTER_PATH=${directory:jupyter_dir} JUPYTER_PATH=${directory:jupyter_dir}
JUPYTER_CONFIG_DIR=${directory:jupyter_config_dir} JUPYTER_CONFIG_DIR=${directory:jupyter_config_dir}
......
...@@ -67,7 +67,6 @@ recipe = slapos.cookbook:wrapper ...@@ -67,7 +67,6 @@ recipe = slapos.cookbook:wrapper
command-line = command-line =
{{ wget_bin }} --no-check-certificate -l1 -r -nd --timestamp {{ wget_bin }} --no-check-certificate -l1 -r -nd --timestamp
wrapper-path = ${monitor-directory:bin}/log-crawler wrapper-path = ${monitor-directory:bin}/log-crawler
parameters-extra = true
[buildout] [buildout]
extends = {{ instance_base_monitor }} extends = {{ instance_base_monitor }}
......
...@@ -99,7 +99,6 @@ recipe = slapos.cookbook:wrapper ...@@ -99,7 +99,6 @@ recipe = slapos.cookbook:wrapper
command-line = command-line =
${monitor-directory:bin}/python {{ monitor_collect_csv_dump }} --output_folder ${monitor-directory:fluentd-log}/consumption/ ${monitor-directory:bin}/python {{ monitor_collect_csv_dump }} --output_folder ${monitor-directory:fluentd-log}/consumption/
wrapper-path = ${monitor-directory:reports}/monitor-collect-csv-dump wrapper-path = ${monitor-directory:reports}/monitor-collect-csv-dump
parameters-extra = true
[monitor-check-cpu-usage] [monitor-check-cpu-usage]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
...@@ -32,14 +32,14 @@ mode = 0644 ...@@ -32,14 +32,14 @@ mode = 0644
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
destination = ${buildout:directory}/template-base-monitor.cfg destination = ${buildout:directory}/template-base-monitor.cfg
md5sum = c3fc83c851568bf0e56393676c489e18 md5sum = 5def53c8faa0dfca313e53ebcc3229fa
mode = 0644 mode = 0644
[template-monitor-distributor] [template-monitor-distributor]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-monitor-distributor.cfg.jinja2 url = ${:_profile_base_location_}/instance-monitor-distributor.cfg.jinja2
destination = ${buildout:directory}/template-monitor-base-distributor.cfg destination = ${buildout:directory}/template-monitor-base-distributor.cfg
md5sum = f579fe67fa1670b46d522b1e5f35c49c md5sum = 0ab9a86df18125335ed365bb673bbcf3
mode = 0644 mode = 0644
[json-test-template] [json-test-template]
......
...@@ -36,5 +36,4 @@ command-line = ...@@ -36,5 +36,4 @@ command-line =
--cert ${directory:etc}/neo.crt --cert ${directory:etc}/neo.crt
--key ${directory:etc}/neo.key --key ${directory:etc}/neo.key
{%- endif %} {%- endif %}
parameters-extra = True
wrapper-path = ${directory:bin}/neoctl wrapper-path = ${directory:bin}/neoctl
...@@ -90,7 +90,7 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0 ...@@ -90,7 +90,7 @@ md5sum = f3259726bd5d824c569dc7db6b7d26a0
[instance-neo-admin] [instance-neo-admin]
<= download-base-neo <= download-base-neo
md5sum = f671bb5bbb006d6bcecee8c7814bee57 md5sum = 4d1ae570b4458e7725454857aabb37f6
[instance-neo-master] [instance-neo-master]
<= download-base-neo <= download-base-neo
......
...@@ -26,4 +26,3 @@ recipe = slapos.cookbook:wrapper ...@@ -26,4 +26,3 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/${:_buildout_section_name_} wrapper-path = ${directory:bin}/${:_buildout_section_name_}
command-line = /bin/bash -c 'cd ${directory:neotest} && ${software:bin}/neotest-runTestSuite "$@"' runTestSuite command-line = /bin/bash -c 'cd ${directory:neotest} && ${software:bin}/neotest-runTestSuite "$@"' runTestSuite
# vvv appends "$@" to argv ^^^ without shell-escaping # vvv appends "$@" to argv ^^^ without shell-escaping
parameters-extra = true
...@@ -87,7 +87,7 @@ context = ...@@ -87,7 +87,7 @@ context =
[instance.cfg] [instance.cfg]
<= jinja2-template <= jinja2-template
md5sum = 7bd68ed8842cd25301bf04bcdcef88f6 md5sum = 19b011baacc5abf253da6a52bb90d1f8
# eggs: # eggs:
......
...@@ -122,31 +122,26 @@ certificate-repository-path = ${directory:slapos-partitions-certificate-reposito ...@@ -122,31 +122,26 @@ certificate-repository-path = ${directory:slapos-partitions-certificate-reposito
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/slapos node instance --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-instance.pid --logfile ${directory:slapos-log}/slapos-instance.log command-line = {{ bin_directory }}/slapos node instance --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-instance.pid --logfile ${directory:slapos-log}/slapos-instance.log
wrapper-path = ${directory:bin}/slapos-node-instance wrapper-path = ${directory:bin}/slapos-node-instance
parameters-extra = true
[slapos-node-software-wrapper] [slapos-node-software-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/slapos node software --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-software.pid --logfile ${directory:slapos-log}/slapos-software.log command-line = {{ bin_directory }}/slapos node software --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-software.pid --logfile ${directory:slapos-log}/slapos-software.log
wrapper-path = ${directory:bin}/slapos-node-software wrapper-path = ${directory:bin}/slapos-node-software
parameters-extra = true
[slapos-node-report-wrapper] [slapos-node-report-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/slapos node report --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-report.pid --logfile ${directory:slapos-log}/slapos-report.log command-line = {{ bin_directory }}/slapos node report --cfg ${slapos-configuration-file:output} --pidfile ${directory:run}/slapos-report.pid --logfile ${directory:slapos-log}/slapos-report.log
wrapper-path = ${directory:bin}/slapos-node-report wrapper-path = ${directory:bin}/slapos-node-report
parameters-extra = true
[slapos-node-status-wrapper] [slapos-node-status-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/slapos node status --cfg ${slapos-configuration-file:output} command-line = {{ bin_directory }}/slapos node status --cfg ${slapos-configuration-file:output}
wrapper-path = ${directory:bin}/slapos-node-status wrapper-path = ${directory:bin}/slapos-node-status
parameters-extra = true
[slapos-node-format-wrapper] [slapos-node-format-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/slapos node format --cfg ${slapos-configuration-file:output} --logfile=${directory:slapos-log}/slapos-node-format.log --now command-line = {{ bin_directory }}/slapos node format --cfg ${slapos-configuration-file:output} --logfile=${directory:slapos-log}/slapos-node-format.log --now
wrapper-path = ${directory:bin}/slapos-node-format wrapper-path = ${directory:bin}/slapos-node-format
parameters-extra = true
[slapos-node-format-wrapper-script] [slapos-node-format-wrapper-script]
# Create a wrapper of the wrapper in etc/run # Create a wrapper of the wrapper in etc/run
......
...@@ -114,9 +114,11 @@ SSLVerifyClient optional ...@@ -114,9 +114,11 @@ SSLVerifyClient optional
RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s
RequestHeader set SSL_CLIENT_SERIAL "%{SSL_CLIENT_M_SERIAL}s" RequestHeader set SSL_CLIENT_SERIAL "%{SSL_CLIENT_M_SERIAL}s"
SSLCACertificateFile {{ parameter_dict['ca-cert'] }} SSLCACertificateFile {{ parameter_dict['ca-cert'] }}
{% if parameter_dict['crl'] -%} {% if not parameter_dict['shared-ca-cert'] %}
{% if parameter_dict['crl'] -%}
SSLCARevocationCheck chain SSLCARevocationCheck chain
SSLCARevocationFile {{ parameter_dict['crl'] }} SSLCARevocationFile {{ parameter_dict['crl'] }}
{%- endif %}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
......
...@@ -19,8 +19,8 @@ md5sum = f539acb8da805ce2de0787769283869e ...@@ -19,8 +19,8 @@ md5sum = f539acb8da805ce2de0787769283869e
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
md5sum = c76c4b36c351b7383dad7bed04e3bc90 md5sum = 257467e676f74c1601fd09d33968fbc3
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
md5sum = 991bfcc4b6abae2ec59b69d71013e8ad md5sum = 516143f5e8a3032a7b7b82741d3a46b7
...@@ -41,7 +41,6 @@ mode = {{ mode }} ...@@ -41,7 +41,6 @@ mode = {{ mode }}
[certificate-request-base] [certificate-request-base]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/request-instance-certificate wrapper-path = ${directory:bin}/request-instance-certificate
parameters-extra = true
command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb
--crt-file ${apache-conf-ssl:cert} --crt-file ${apache-conf-ssl:cert}
--key-file ${apache-conf-ssl:key} --key-file ${apache-conf-ssl:key}
......
...@@ -116,4 +116,3 @@ mode = 755 ...@@ -116,4 +116,3 @@ mode = 755
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${phantomjs:location}/phantomjs-slapos command-line = ${phantomjs:location}/phantomjs-slapos
wrapper-path = $${create-directory:bin}/phantomjs wrapper-path = $${create-directory:bin}/phantomjs
parameters-extra = true
...@@ -89,7 +89,7 @@ repository = https://lab.nexedi.com/nexedi/erp5.git ...@@ -89,7 +89,7 @@ repository = https://lab.nexedi.com/nexedi/erp5.git
[template] [template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
md5sum = 63253c24c5c09716a37f457f2a6b3b23 md5sum = 6626794c9dbb2530bb8ba3d331e27542
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 640 mode = 640
......
...@@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab ...@@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab
[template-runner] [template-runner]
filename = instance-runner.cfg filename = instance-runner.cfg
md5sum = 16ff762e71c92f8a8e1062906eb10b9c md5sum = 111f9643078ab7fd27e6695f61ec837c
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
......
...@@ -208,7 +208,6 @@ command-line = ${buildout:directory}/bin/slaprunnertest $${:arguments} ...@@ -208,7 +208,6 @@ command-line = ${buildout:directory}/bin/slaprunnertest $${:arguments}
wrapper-path = $${directory:bin}/runTestSuite wrapper-path = $${directory:bin}/runTestSuite
environment = PATH=$${shell-environment:path} environment = PATH=$${shell-environment:path}
RUNNER_CONFIG=$${slapos-cfg:rendered} RUNNER_CONFIG=$${slapos-cfg:rendered}
parameters-extra = true
# Deploy openssh-server # Deploy openssh-server
[runner-sshd-port] [runner-sshd-port]
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{{ parameter_dict['domain'] }} { {{ parameter_dict['domain'] }} {
tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} { tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
ca {{ca_custom_frontend_dict['rendered']}} ca {{ca_custom_frontend_dict['rendered']}}
} }
...@@ -16,20 +16,37 @@ root {{ directory_dict['public_html'] }} ...@@ -16,20 +16,37 @@ root {{ directory_dict['public_html'] }}
{% if parameter_dict['enable-basic-auth'] == 'true' -%} {% if parameter_dict['enable-basic-auth'] == 'true' -%}
basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}} basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
{%- endif %} {%- endif %}
} {% if parameter_dict['proxy'] == 'true' -%}
{% if parameter_dict['type'] == 'zope' -%}
proxy / {{parameter_dict['url']}}/VirtualHostBase/https/{{ parameter_dict['domain'] }}/VirtualHostRoot/ {
insecure_skip_verify
}
{% else %}
proxy / {{parameter_dict['url']}}
{%- endif %}
{%- endif %}
bind {{caddy_configuration_dict['ipv6']}}
bind {{caddy_configuration_dict['ipv6']}} }
{%- endif %} {%- endif %}
[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port-ipv6']}} { [{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port']}} {
tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} { tls {{ custom_cert_dict['cert-file'] }} {{ custom_cert_dict['key-file'] }} {
ca {{ certificate_authority_dict['ca-cert-file'] }} ca {{ certificate_authority_dict['ca-cert-file'] }}
} }
log {{caddy_configuration_dict['access_log']}} log {{caddy_configuration_dict['access_log']}}
...@@ -42,11 +59,25 @@ bind {{caddy_configuration_dict['ipv6']}} ...@@ -42,11 +59,25 @@ bind {{caddy_configuration_dict['ipv6']}}
basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}} basicauth / {{ parameter_dict['username'] }} {{parameter_dict['password']}}
{%- endif %} {%- endif %}
bind {{caddy_configuration_dict['ipv6']}} {% if parameter_dict['proxy'] == 'true' -%}
{% if parameter_dict['type'] == 'zope' -%}
proxy / {{parameter_dict['url']}}/VirtualHostBase/https/[{{caddy_configuration_dict['ipv6']}}]:{{parameter_dict['port']}}/VirtualHostRoot/ {
insecure_skip_verify
}
{% else %}
proxy / {{parameter_dict['url']}}
{%- endif %}
{%- endif %}
bind {{caddy_configuration_dict['ipv6']}}
} }
[{{caddy_configuration_dict['local_ip']}}]:{{parameter_dict['port-ipv4']}} { [{{caddy_configuration_dict['local_ip']}}]:{{parameter_dict['port']}} {
log {{caddy_configuration_dict['access_log']}} log {{caddy_configuration_dict['access_log']}}
......
...@@ -27,7 +27,7 @@ mode = 0644 ...@@ -27,7 +27,7 @@ mode = 0644
[template-caddyfile] [template-caddyfile]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/Caddyfile.in url = ${:_profile_base_location_}/Caddyfile.in
md5sum = 88c4c33e374ea3f61cdd36b2816d24ba md5sum = 05b8347df3c5803a18a515687a3504e3
filename = Caddyfile.in filename = Caddyfile.in
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 0644 mode = 0644
...@@ -35,7 +35,7 @@ mode = 0644 ...@@ -35,7 +35,7 @@ mode = 0644
[template-caddy] [template-caddy]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-caddy.cfg.in url = ${:_profile_base_location_}/instance-caddy.cfg.in
md5sum = 3b796dee5c509393fd396fd019914a2e md5sum = 4ed3a50a15a793fec330332be30a9f3a
output = ${buildout:directory}/instance-caddy.cfg.in output = ${buildout:directory}/instance-caddy.cfg.in
mode = 0644 mode = 0644
...@@ -49,7 +49,7 @@ mode = 0644 ...@@ -49,7 +49,7 @@ mode = 0644
[template-caddy-service] [template-caddy-service]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/template-caddy-service.sh.in url = ${:_profile_base_location_}/template-caddy-service.sh.in
md5sum = 5467fac7b95acde681e613ae98ce990d md5sum = 1736f72c7c76afe133753389da7c0b1f
output = ${buildout:directory}/template-caddy-service.sh.in output = ${buildout:directory}/template-caddy-service.sh.in
mode = 0644 mode = 0644
...@@ -59,7 +59,7 @@ path = ${go_github.com_mholt_caddy:location} ...@@ -59,7 +59,7 @@ path = ${go_github.com_mholt_caddy:location}
go = ${gowork:golang}/bin/go go = ${gowork:golang}/bin/go
configure-command = : configure-command = :
make-targets = make-targets =
make-binary = cd ${:path}/caddy && ${:go} install -v make-binary = cd ${:path}/caddy && ${:go} install -v
environment = environment =
PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
GOPATH=${gowork:directory} GOPATH=${gowork:directory}
......
...@@ -9,5 +9,5 @@ depends_gitfetch = ...@@ -9,5 +9,5 @@ depends_gitfetch =
[go_github.com_mholt_caddy] [go_github.com_mholt_caddy]
<= go-git-package <= go-git-package
go.importpath = github.com/mholt/caddy go.importpath = github.com/mholt/caddy
repository = https://github.com/mholt/caddy.git repository = https://github.com/mholt/caddy
revision = v0.10.10-0-gc4dfbb9956 revision = v0.10.11-0-gd3f338ddab
...@@ -116,16 +116,18 @@ mode = 0600 ...@@ -116,16 +116,18 @@ mode = 0600
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
password = $${slap-parameter:password} password = $${slap-parameter:password}
user = $${slap-parameter:username} user = $${slap-parameter:username}
secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port-ipv6} secure_access = https://[$${caddy-configuration:ipv6}]:$${slap-parameter:port}
[slap-parameter] [slap-parameter]
domain = domain =
key-content = key-content =
cert-content = cert-content =
caddy-ca-certificate = caddy-ca-certificate =
port-ipv6 = 9443 port = 9443
port-ipv4 = 4443
enable-quic = true enable-quic = true
enable-basic-auth = enable-basic-auth =
username = admin username = admin
password = $${htpasswd:passwd} password = $${htpasswd:passwd}
\ No newline at end of file proxy = false
type = zope
url =
\ No newline at end of file
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
# BEWARE: This file is operated by slapgrid # BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically # BEWARE: It will be overwritten automatically
{{ caddy_exec }} -conf {{caddy_configuration_dict['rendered']}} {{ caddy_exec }} -conf {{caddy_configuration_dict['rendered']}} \
{%- if parameter_dict['enable-quic'] != 'false' %} {%- if parameter_dict['enable-quic'] != 'false' %}
-quic -quic
{%- endif -%} {%- endif -%}
\ No newline at end of file
...@@ -24,11 +24,11 @@ md5sum = d8bebf1629aacffd619541f363687b4a ...@@ -24,11 +24,11 @@ md5sum = d8bebf1629aacffd619541f363687b4a
[template-authenticated-server] [template-authenticated-server]
filename = instance-auth-server.cfg.jinja2.in filename = instance-auth-server.cfg.jinja2.in
md5sum = a317d2f948cd3d16c860d05cc07ecf42 md5sum = c005cfef03a0c2e504fcfa075e59934a
[template-caucase] [template-caucase]
filename = instance-caucase.cfg.jinja2.in filename = instance-caucase.cfg.jinja2.in
md5sum = d31d4c9855d653d3d74c6133a7d85530 md5sum = bab4cf56121f964eaad1abfba695d307
[instance-caucase] [instance-caucase]
filename = instance.cfg.in filename = instance.cfg.in
......
...@@ -33,7 +33,6 @@ wrapper-path = ${directory:bin}/request-instance-certificate ...@@ -33,7 +33,6 @@ wrapper-path = ${directory:bin}/request-instance-certificate
cert-file = ${directory:ssl}/instance.cert.pem cert-file = ${directory:ssl}/instance.cert.pem
key-file = ${directory:ssl}/instance.key.pem key-file = ${directory:ssl}/instance.key.pem
ca-cert = ${directory:ssl}/cacert.pem ca-cert = ${directory:ssl}/cacert.pem
parameters-extra = true
command-line = {{ certificate_request_bin }} command-line = {{ certificate_request_bin }}
--crt-file ${:cert-file} --crt-file ${:cert-file}
--key-file ${:key-file} --key-file ${:key-file}
......
...@@ -57,7 +57,6 @@ wrapper-path = ${directory:bin}/request-base-certificate ...@@ -57,7 +57,6 @@ wrapper-path = ${directory:bin}/request-base-certificate
cert-file = ${ca-nginx-ssl-config:cert} cert-file = ${ca-nginx-ssl-config:cert}
key-file = ${ca-nginx-ssl-config:key} key-file = ${ca-nginx-ssl-config:key}
ca-cert = ${directory:ssl}/cacert.pem ca-cert = ${directory:ssl}/cacert.pem
parameters-extra = true
command-line = {{ certificate_request_bin }} command-line = {{ certificate_request_bin }}
--crt-file ${:cert-file} --crt-file ${:cert-file}
--key-file ${:key-file} --key-file ${:key-file}
......
...@@ -608,10 +608,6 @@ scripts = zodbanalyze ...@@ -608,10 +608,6 @@ scripts = zodbanalyze
recipe = zc.recipe.egg:develop recipe = zc.recipe.egg:develop
setup = ${erp5:location} setup = ${erp5:location}
[cloudooo-repository]
branch =
revision = 00604a3a5a69082f7c607665cc6badd5104a32b9
[slapos-deps-eggs] [slapos-deps-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs += eggs +=
...@@ -636,9 +632,6 @@ pysvn = 1.7.10+SlapOSPatched002 ...@@ -636,9 +632,6 @@ pysvn = 1.7.10+SlapOSPatched002
python-ldap = 2.4.32+SlapOSPatched001 python-ldap = 2.4.32+SlapOSPatched001
python-magic = 0.4.12+SlapOSPatched001 python-magic = 0.4.12+SlapOSPatched001
# specify dev version to be sure that an old released version is not used
cloudooo = 1.2.5-dev
# use newer version than specified in ZTK # use newer version than specified in ZTK
PasteDeploy = 1.5.2 PasteDeploy = 1.5.2
argparse = 1.4.0 argparse = 1.4.0
......
...@@ -27,7 +27,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d ...@@ -27,7 +27,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 06e4e35e2a9ed3c6a611938ff3bc3b65 md5sum = e731fa1d24fc87b26efdbcb40d74c55d
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
...@@ -35,7 +35,7 @@ md5sum = 091d3c3feb2d543d176b0fadb11c07dc ...@@ -35,7 +35,7 @@ md5sum = 091d3c3feb2d543d176b0fadb11c07dc
[template-cloudooo] [template-cloudooo]
filename = instance-cloudoo.cfg.in filename = instance-cloudoo.cfg.in
md5sum = a3ca0af4983b3b80d191de3f2cc2146d md5sum = eeb584a393b15582a3be6b591dcdcde6
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
...@@ -55,7 +55,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce ...@@ -55,7 +55,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
[template-postfix] [template-postfix]
filename = instance-postfix.cfg.in filename = instance-postfix.cfg.in
md5sum = e217f8b55f22d99ee2352eba6807d6f6 md5sum = f6d9ae099ac0f01ce45f80a452a4d203
[template-postfix-master-cf] [template-postfix-master-cf]
filename = postfix_master.cf.in filename = postfix_master.cf.in
...@@ -87,11 +87,11 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba ...@@ -87,11 +87,11 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 6aec575a632a2a2672a54bcaedae81cb md5sum = 3fdfbc82c450c35a9a444dfbc0a1c196
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
md5sum = a71ad387eab681b9020e271cba2c7a79 md5sum = 29cfe35d37cf615378574707978e5f75
[template-haproxy-cfg] [template-haproxy-cfg]
filename = haproxy.cfg.in filename = haproxy.cfg.in
......
...@@ -40,7 +40,6 @@ mode = {{ mode }} ...@@ -40,7 +40,6 @@ mode = {{ mode }}
[certificate-request-base] [certificate-request-base]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:bin}/request-instance-certificate wrapper-path = ${directory:bin}/request-instance-certificate
parameters-extra = true
command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb command-line = {{ parameter_dict['bin-directory'] }}/caucase-cliweb
--crt-file ${apache-conf-ssl:cert} --crt-file ${apache-conf-ssl:cert}
--key-file ${apache-conf-ssl:key} --key-file ${apache-conf-ssl:key}
......
...@@ -149,4 +149,3 @@ environment = ...@@ -149,4 +149,3 @@ environment =
DISPLAY=:0 DISPLAY=:0
TMPDIR=${directory:run} TMPDIR=${directory:run}
command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver command-line = {{ parameter_dict['wkhtmltopdf'] }}/wkhtmltopdf --use-xserver
parameters-extra = true
...@@ -223,7 +223,6 @@ recipe = slapos.cookbook:wrapper ...@@ -223,7 +223,6 @@ recipe = slapos.cookbook:wrapper
# will reject it. # will reject it.
command-line = "{{ parameter_dict['mariadb-location'] }}/bin/${:command}" --defaults-file="${my-cnf:rendered}" command-line = "{{ parameter_dict['mariadb-location'] }}/bin/${:command}" --defaults-file="${my-cnf:rendered}"
wrapper-path = ${directory:bin}/${:command} wrapper-path = ${directory:bin}/${:command}
parameters-extra = true
[binary-wrap-mysql] [binary-wrap-mysql]
< = binary-wrap-base < = binary-wrap-base
...@@ -329,7 +328,6 @@ command-line = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }} ...@@ -329,7 +328,6 @@ command-line = "{{ parameter_dict['promise-check-slow-queries-digest-result'] }}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}" command-line = "{{ parameter_dict['bin-directory'] }}/is-local-tcp-port-opened" "${my-cnf-parameters:ip}" "${my-cnf-parameters:port}"
wrapper-path = ${directory:promise}/mariadb wrapper-path = ${directory:promise}/mariadb
parameters-extra = true
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }} monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
......
...@@ -61,7 +61,6 @@ var-spool-postfix-trace = ${:var-spool-postfix}/trace ...@@ -61,7 +61,6 @@ var-spool-postfix-trace = ${:var-spool-postfix}/trace
{% set socket = 'inet:' ~ ip ~ ':' ~ milter_port -%} {% set socket = 'inet:' ~ ip ~ ':' ~ milter_port -%}
[{{ section('divert-milter') }}] [{{ section('divert-milter') }}]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
parameters-extra = true
command-line = command-line =
'{{ parameter_dict['buildout-bin-directory'] }}/munnel' '{{ parameter_dict['buildout-bin-directory'] }}/munnel'
--listen '{{ socket }}' --listen '{{ socket }}'
...@@ -183,7 +182,6 @@ update-command = ${:command} ...@@ -183,7 +182,6 @@ update-command = ${:command}
[wrapper-postfix-saslpasswd2] [wrapper-postfix-saslpasswd2]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
parameters-extra = true
command-line = '{{ parameter_dict['cyrus-sasl-location'] }}/sbin/saslpasswd2' -f '${configuration:cyrus-sasldb}' command-line = '{{ parameter_dict['cyrus-sasl-location'] }}/sbin/saslpasswd2' -f '${configuration:cyrus-sasldb}'
wrapper-path = ${directory:bin}/saslpasswd2 wrapper-path = ${directory:bin}/saslpasswd2
...@@ -192,7 +190,6 @@ recipe = slapos.cookbook:wrapper ...@@ -192,7 +190,6 @@ recipe = slapos.cookbook:wrapper
environment = environment =
MAIL_CONFIG=${directory:etc-postfix} MAIL_CONFIG=${directory:etc-postfix}
SASL_CONF_PATH=${directory:etc-cyrus} SASL_CONF_PATH=${directory:etc-cyrus}
parameters-extra = true
[base-bin-wrapper] [base-bin-wrapper]
< = base-wrapper < = base-wrapper
......
...@@ -183,7 +183,6 @@ recipe = slapos.cookbook:wrapper ...@@ -183,7 +183,6 @@ recipe = slapos.cookbook:wrapper
environment = environment =
HOSTALIASES=${hostaliases:rendered} HOSTALIASES=${hostaliases:rendered}
HOSTS=${hosts:rendered} HOSTS=${hosts:rendered}
parameters-extra = true
command-line = '{{ parameter_dict['userhosts'] }}' ${:wrapped-command-line} command-line = '{{ parameter_dict['userhosts'] }}' ${:wrapped-command-line}
{# Hack to deploy SSL certs via instance parameters -#} {# Hack to deploy SSL certs via instance parameters -#}
...@@ -370,7 +369,6 @@ path = ${directory:promises}/{{ name }} ...@@ -370,7 +369,6 @@ path = ${directory:promises}/{{ name }}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }} command-line = '{{ parameter_dict['bin-directory'] }}/is-process-older-than-dependency-set' '{{ "${" ~ conf_parameter_name ~ ":pid-file}" }}' {{ " ".join(shell_escaped_extra_path_list) }}
wrapper-path = ${directory:promises}/{{ name }}-is-running-actual-product wrapper-path = ${directory:promises}/{{ name }}-is-running-actual-product
parameters-extra = true
{% if use_ipv6 -%} {% if use_ipv6 -%}
[{{ zope_tunnel_section_name }}] [{{ zope_tunnel_section_name }}]
......
...@@ -23,4 +23,4 @@ md5sum = 117e46af6d9d31c09eeb86089d11407e ...@@ -23,4 +23,4 @@ md5sum = 117e46af6d9d31c09eeb86089d11407e
[template-logrotate-base] [template-logrotate-base]
filename = instance-logrotate-base.cfg.in filename = instance-logrotate-base.cfg.in
md5sum = c786f73c2a99390a5fad8aa3e01de627 md5sum = 9f44fc5ee22c6662297b41f71fa11b7c
...@@ -55,7 +55,6 @@ nocompress = ...@@ -55,7 +55,6 @@ nocompress =
[logrotate] [logrotate]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
parameters-extra = true
command-line = {{ logrotate_location }}/sbin/logrotate -s "${logrotate-directory:srv}/logrotate.status" "${logrotate-conf:rendered}" command-line = {{ logrotate_location }}/sbin/logrotate -s "${logrotate-directory:srv}/logrotate.status" "${logrotate-conf:rendered}"
wrapper-path = ${logrotate-directory:bin}/logrotate wrapper-path = ${logrotate-directory:bin}/logrotate
......
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = 03254b14a2ff242f7588a307d8c27f23 md5sum = 75fe1b222c269e69226796bf6059a747
...@@ -250,7 +250,6 @@ mode = 700 ...@@ -250,7 +250,6 @@ mode = 700
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/is-process-older-than-dependency-set ${monitor-httpd-conf-parameter:pid-file} command-line = {{ bin_directory }}/is-process-older-than-dependency-set ${monitor-httpd-conf-parameter:pid-file}
wrapper-path = ${directory:promises}/promise-monitor-httpd-is-process-older-than-dependency-set wrapper-path = ${directory:promises}/promise-monitor-httpd-is-process-older-than-dependency-set
parameters-extra = true
[monitor-globalstate-wrapper] [monitor-globalstate-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
...@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d ...@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
[template-pull-backup] [template-pull-backup]
filename = instance-pull-backup.cfg.in filename = instance-pull-backup.cfg.in
md5sum = fe4811540683bfcfac5ac12de084b623 md5sum = 5f35d9c0d08a268ed0c0f0dbef114f42
[template-replicated] [template-replicated]
filename = template-replicated.cfg.in filename = template-replicated.cfg.in
......
...@@ -254,7 +254,6 @@ home = $${basedirectory:ssh-home} ...@@ -254,7 +254,6 @@ home = $${basedirectory:ssh-home}
identity-file = $${:home}/id_rsa identity-file = $${:home}/id_rsa
command-line = ${openssh:location}/bin/ssh -T -o "UserKnownHostsFile $${pbs:known-hosts}" -i $${:identity-file} command-line = ${openssh:location}/bin/ssh -T -o "UserKnownHostsFile $${pbs:known-hosts}" -i $${:identity-file}
wrapper-path = $${rootdirectory:bin}/ssh wrapper-path = $${rootdirectory:bin}/ssh
parameters-extra = true
#---------------- #----------------
......
#!/bin/bash -e
# simple mergetool for buildout.hash.cfg - just update hash
# suggested installation:
# git config merge.tool update-hash-mergetool
# git config mergetool.update-hash-mergetool.cmd './update-hash-mergetool "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
# git config mergetool.update-hash-mergetool.trustExitCode true
BASE=$1
LOCAL=$2
REMOTE=$3
MERGED=$4
if echo "$MERGED" | grep -q "buildout.hash.cfg"; then
cp $REMOTE $MERGED
exec ./update-hash $MERGED
else
echo "this mergetool only supports buildout.hash.cfg" 1>&2
exit 1
fi
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