Skip to content

S
SlapOS Develop
Commit 826371fd authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Update Release Candidate

parents 2482320d ed707d3b
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 61 deletions
CHANGES.rst
View file @ 826371fd
Changes Changes
======= =======
1.0.123 (2019-10-03)
--------------------
- wrapper: accept hash-files already existing inside the partition directory
1.0.122 (2019-09-24) 1.0.122 (2019-09-24)
-------------------- --------------------
......
component/qemu-kvm/buildout.cfg
View file @ 826371fd
...@@ -19,8 +19,8 @@ extends = ...@@ -19,8 +19,8 @@ extends =
[kvm] [kvm]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
# qemu-kvm and qemu are now the same since 1.3. # qemu-kvm and qemu are now the same since 1.3.
url = https://download.qemu.org/qemu-4.0.0.tar.xz url = https://download.qemu.org/qemu-4.1.0.tar.xz
md5sum = 0afeca336fd57ae3d3086ec07f59d708 md5sum = cdf2b5ca52b9abac9bacb5842fa420f8
configure-options = configure-options =
--target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu" --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
--enable-system --enable-system
......
setup.py
View file @ 826371fd
...@@ -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.122' version = '1.0.123'
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"
......
slapos/recipe/wrapper.py
View file @ 826371fd
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
############################################################################## ##############################################################################
import os, shlex import os, shlex
from six.moves import filter
from slapos.recipe.librecipe import GenericBaseRecipe, generateHashFromFiles from slapos.recipe.librecipe import GenericBaseRecipe, generateHashFromFiles
from zc.buildout import UserError from zc.buildout import UserError
...@@ -51,7 +50,9 @@ class Recipe(GenericBaseRecipe): ...@@ -51,7 +50,9 @@ class Recipe(GenericBaseRecipe):
hash_files = options.get('hash-files') hash_files = options.get('hash-files')
if hash_files: if hash_files:
self.hash_files = hash_files.split() self.hash_files = hash_files.split()
self._existing = list(filter(os.path.exists, self.hash_files)) prefix = os.path.realpath(buildout['buildout']['directory']) + os.sep
self._existing = [x for x in self.hash_files
if os.path.exists(x) and not os.path.realpath(x).startswith(prefix)]
else: else:
self.hash_files = [] self.hash_files = []
hash_files = options.get('hash-existing-files') hash_files = options.get('hash-existing-files')
......
software/caddy-frontend/buildout.hash.cfg
View file @ 826371fd
...@@ -22,15 +22,15 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b ...@@ -22,15 +22,15 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg.in filename = instance-apache-frontend.cfg.in
md5sum = 36eaee40086aef59b4ea11c52e6063e3 md5sum = 7f2f7b40e3639c50cf7dd929f4425f20
[template-caddy-replicate] [template-caddy-replicate]
filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
md5sum = f874519f5c000d0c479dde34e1cbb268 md5sum = bd73ad5ef84fe6bf0f479ee45da3139d
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = d2afd6ef52754b14ba9bf881b9f685c6 md5sum = 5913a176c025cdadee6782f8ad285dc4
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
...@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8 ...@@ -118,4 +118,4 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
[template-kedifa] [template-kedifa]
filename = instance-kedifa.cfg.in filename = instance-kedifa.cfg.in
md5sum = ff547807d8b703a124a43eab211666c2 md5sum = bb1eb172e65d8ffe5b161eae191947e1
software/caddy-frontend/instance-apache-frontend.cfg.in
View file @ 826371fd
...@@ -345,9 +345,8 @@ wrapper-path = ${directory:bin}/caddy-wrapper ...@@ -345,9 +345,8 @@ wrapper-path = ${directory:bin}/caddy-wrapper
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${caddy-wrapper:wrapper-path} -pidfile ${caddy-configuration:pid-file} command-line = ${caddy-wrapper:wrapper-path} -pidfile ${caddy-configuration:pid-file}
wrapper-path = ${directory:service}/frontend_caddy wrapper-path = ${directory:service}/frontend_caddy
hash-files = hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
${buildout:directory}/software_release/buildout.cfg hash-files = ${caddy-wrapper:wrapper-path}
${caddy-wrapper:wrapper-path}
[not-found-html] [not-found-html]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
...@@ -454,7 +453,7 @@ recipe = slapos.cookbook:wrapper ...@@ -454,7 +453,7 @@ recipe = slapos.cookbook:wrapper
command-line = {{ parameter_dict['trafficserver'] }}/bin/traffic_cop command-line = {{ parameter_dict['trafficserver'] }}/bin/traffic_cop
wrapper-path = ${trafficserver-variable:wrapper-path} wrapper-path = ${trafficserver-variable:wrapper-path}
environment = TS_ROOT=${buildout:directory} environment = TS_ROOT=${buildout:directory}
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[trafficserver-reload] [trafficserver-reload]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
software/caddy-frontend/instance-apache-replicate.cfg.in
View file @ 826371fd
...@@ -533,8 +533,9 @@ command-line = {{ parameter_dict['caddy'] }} ...@@ -533,8 +533,9 @@ command-line = {{ parameter_dict['caddy'] }}
-root ${:directory} -root ${:directory}
wrapper-path = ${directory:service}/rejected-slave-publish wrapper-path = ${directory:service}/rejected-slave-publish
hash-files = hash-existing-files =
${buildout:directory}/software_release/buildout.cfg ${buildout:directory}/software_release/buildout.cfg
hash-files =
${rejected-slave-template:rendered} ${rejected-slave-template:rendered}
${rejected-slave-certificate:certificate} ${rejected-slave-certificate:certificate}
......
software/caddy-frontend/instance-kedifa.cfg.in
View file @ 826371fd
...@@ -21,7 +21,7 @@ parts = ...@@ -21,7 +21,7 @@ parts =
promise-expose-csr_id-ip-port promise-expose-csr_id-ip-port
[caucased] [caucased]
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
{% set caucase_host = '[' ~ instance_parameter['ipv6-random'] ~ ']' %} {% set caucase_host = '[' ~ instance_parameter['ipv6-random'] ~ ']' %}
{% set caucase_netloc = caucase_host ~ ':' ~ instance_parameter['configuration.caucase_port'] -%} {% set caucase_netloc = caucase_host ~ ':' ~ instance_parameter['configuration.caucase_port'] -%}
...@@ -175,7 +175,7 @@ command-line = {{ parameter_dict['caddy'] }} ...@@ -175,7 +175,7 @@ command-line = {{ parameter_dict['caddy'] }}
-root ${directory:csr_id} -root ${directory:csr_id}
wrapper-path = ${directory:service}/expose-csr_id wrapper-path = ${directory:service}/expose-csr_id
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[get-csr_id-certificate] [get-csr_id-certificate]
recipe = collective.recipe.shelloutput recipe = collective.recipe.shelloutput
...@@ -249,7 +249,7 @@ command-line = {{ parameter_dict['kedifa'] }} ...@@ -249,7 +249,7 @@ command-line = {{ parameter_dict['kedifa'] }}
--logfile ${kedifa-config:logfile} --logfile ${kedifa-config:logfile}
wrapper-path = ${directory:service}/kedifa wrapper-path = ${directory:service}/kedifa
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
# Publish KeDiFa configuration for upload and download for each slave # Publish KeDiFa configuration for upload and download for each slave
{%- set slave_kedifa_information = {} -%} {%- set slave_kedifa_information = {} -%}
......
software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
View file @ 826371fd
...@@ -395,7 +395,7 @@ ipv4 = ${slap-network-information:local-ipv4} ...@@ -395,7 +395,7 @@ ipv4 = ${slap-network-information:local-ipv4}
ipv6 = ${slap-network-information:global-ipv6} ipv6 = ${slap-network-information:global-ipv6}
wrapper-path = {{ service_directory}}/6tunnel-${:ipv6-port} wrapper-path = {{ service_directory}}/6tunnel-${:ipv6-port}
command-line = {{ sixtunnel_executable }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port} command-line = {{ sixtunnel_executable }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port}
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[tunnel-6to4-base-http_port] [tunnel-6to4-base-http_port]
<= tunnel-6to4-base <= tunnel-6to4-base
...@@ -464,7 +464,7 @@ command-line = {{ kedifa_updater }} ...@@ -464,7 +464,7 @@ command-line = {{ kedifa_updater }}
{{ kedifa_updater_state_file }} {{ kedifa_updater_state_file }}
wrapper-path = {{ service_directory }}/kedifa-updater wrapper-path = {{ service_directory }}/kedifa-updater
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[kedifa-updater-run] [kedifa-updater-run]
recipe = plone.recipe.command recipe = plone.recipe.command
...@@ -579,7 +579,7 @@ command-line = {{ caddy_executable }} ...@@ -579,7 +579,7 @@ command-line = {{ caddy_executable }}
-root {{ directory_csr_id }} -root {{ directory_csr_id }}
wrapper-path = {{ service_directory }}/expose-csr_id wrapper-path = {{ service_directory }}/expose-csr_id
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[get-csr_id-certificate] [get-csr_id-certificate]
recipe = collective.recipe.shelloutput recipe = collective.recipe.shelloutput
......
software/caddy-frontend/test/test.py
View file @ 826371fd
...@@ -379,7 +379,7 @@ class TestDataMixin(object): ...@@ -379,7 +379,7 @@ class TestDataMixin(object):
partition_id = caddy_wrapper_path.split('/')[-3] partition_id = caddy_wrapper_path.split('/')[-3]
hash_value_dict[ hash_value_dict[
'caddy-%s' % (partition_id)] = generateHashFromFiles( 'caddy-%s' % (partition_id)] = generateHashFromFiles(
hash_file_list + [caddy_wrapper_path] [caddy_wrapper_path] + hash_file_list
) )
for rejected_slave_publish_path in glob.glob(os.path.join( for rejected_slave_publish_path in glob.glob(os.path.join(
self.instance_path, '*', 'etc', 'Caddyfile-rejected-slave')): self.instance_path, '*', 'etc', 'Caddyfile-rejected-slave')):
...@@ -389,7 +389,7 @@ class TestDataMixin(object): ...@@ -389,7 +389,7 @@ class TestDataMixin(object):
hash_value_dict[ hash_value_dict[
'rejected-slave-publish' 'rejected-slave-publish'
] = generateHashFromFiles( ] = generateHashFromFiles(
hash_file_list + [rejected_slave_publish_path, rejected_slave_pem_path] [rejected_slave_publish_path, rejected_slave_pem_path] + hash_file_list
) )
runtime_data = self.getTrimmedProcessInfo() runtime_data = self.getTrimmedProcessInfo()
......
software/kvm/buildout.hash.cfg
View file @ 826371fd
...@@ -19,7 +19,7 @@ md5sum = 028b6a6456d744c11b1bb2c51ecd51b2 ...@@ -19,7 +19,7 @@ md5sum = 028b6a6456d744c11b1bb2c51ecd51b2
[template-kvm] [template-kvm]
filename = instance-kvm.cfg.jinja2 filename = instance-kvm.cfg.jinja2
md5sum = 12a99227828e834d97ee0c68246c467c md5sum = 325326fa7266757dfed028b11aae58a0
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
......
software/kvm/instance-kvm.cfg.jinja2
View file @ 826371fd
...@@ -181,7 +181,7 @@ ipv4 = ${slap-network-information:local-ipv4} ...@@ -181,7 +181,7 @@ ipv4 = ${slap-network-information:local-ipv4}
ipv6 = ${slap-network-information:global-ipv6} ipv6 = ${slap-network-information:global-ipv6}
wrapper-path = ${directory:services}/6tunnel-${:ipv6-port} wrapper-path = ${directory:services}/6tunnel-${:ipv6-port}
command-line = {{ sixtunnel_executable_location }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port} command-line = {{ sixtunnel_executable_location }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port}
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
{% if use_nat == 'true' and nat_rule_list -%} {% if use_nat == 'true' and nat_rule_list -%}
{% for port in nat_rule_list.split(' ') -%} {% for port in nat_rule_list.split(' ') -%}
...@@ -206,7 +206,7 @@ socket-path = ${kvm-controller-parameter-dict:socket-path} ...@@ -206,7 +206,7 @@ socket-path = ${kvm-controller-parameter-dict:socket-path}
wrapper-path = ${directory:services}/kvm wrapper-path = ${directory:services}/kvm
command-line = ${kvm-run:rendered} command-line = ${kvm-run:rendered}
kvm-controller = ${kvm-controller-wrapper:wrapper-path} kvm-controller = ${kvm-controller-wrapper:wrapper-path}
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[kvm-controller-wrapper] [kvm-controller-wrapper]
...@@ -286,7 +286,7 @@ wrapped-path = ${novnc-instance:path} ...@@ -286,7 +286,7 @@ wrapped-path = ${novnc-instance:path}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${websockify-sighandler:wrapper-path} command-line = ${websockify-sighandler:wrapper-path}
wrapper-path = ${directory:services}/websockify wrapper-path = ${directory:services}/websockify
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
wait-for-files = wait-for-files =
${ca-novnc:key-file} ${ca-novnc:key-file}
${ca-novnc:cert-file} ${ca-novnc:cert-file}
...@@ -306,7 +306,7 @@ ca-crl = ${cadirectory:crl} ...@@ -306,7 +306,7 @@ ca-crl = ${cadirectory:crl}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${certificate-authority:wrapper} command-line = ${certificate-authority:wrapper}
wrapper-path = ${directory:services}/certificate_authority wrapper-path = ${directory:services}/certificate_authority
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[cadirectory] [cadirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
...@@ -348,7 +348,7 @@ binary = ${directory:bin}/crond_raw ...@@ -348,7 +348,7 @@ binary = ${directory:bin}/crond_raw
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${cron:binary} command-line = ${cron:binary}
wrapper-path = ${directory:services}/crond wrapper-path = ${directory:services}/crond
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[cron-simplelogger] [cron-simplelogger]
recipe = slapos.cookbook:simplelogger recipe = slapos.cookbook:simplelogger
...@@ -397,7 +397,7 @@ use-hash-url = false ...@@ -397,7 +397,7 @@ use-hash-url = false
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${httpd:wrapper} command-line = ${httpd:wrapper}
wrapper-path = ${directory:services}/http-server wrapper-path = ${directory:services}/http-server
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[httpd-promise] [httpd-promise]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
...@@ -623,7 +623,7 @@ runner-path = ${directory:bin}/6tunnel-cluster ...@@ -623,7 +623,7 @@ runner-path = ${directory:bin}/6tunnel-cluster
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${tunnel-cluster-url:runner-path} command-line = ${tunnel-cluster-url:runner-path}
wrapper-path = ${directory:services}/6tunnel-cluster wrapper-path = ${directory:services}/6tunnel-cluster
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[ansible-vm-promise] [ansible-vm-promise]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
software/plantuml/buildout.hash.cfg
View file @ 826371fd
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 8915151103355dd59da31979a14e59fd md5sum = 8ed7b3f59d94869a328c72fa9bbfd7d5
[tomcat-server-xml] [tomcat-server-xml]
filename = server.xml.in filename = server.xml.in
......
software/plantuml/instance.cfg.in
View file @ 826371fd
...@@ -63,8 +63,9 @@ environment = ...@@ -63,8 +63,9 @@ environment =
# related links: # related links:
# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
# https://bugs.openjdk.java.net/browse/JDK-7175487 # https://bugs.openjdk.java.net/browse/JDK-7175487
hash-files = hash-existing-files =
$${buildout:directory}/software_release/buildout.cfg $${buildout:directory}/software_release/buildout.cfg
hash-files =
$${tomcat-server-xml:output} $${tomcat-server-xml:output}
ip = $${tomcat-server-xml:ip} ip = $${tomcat-server-xml:ip}
...@@ -120,4 +121,4 @@ catalina_logs = $${:catalina_base}/logs ...@@ -120,4 +121,4 @@ catalina_logs = $${:catalina_base}/logs
catalina_temp = $${:catalina_base}/temp catalina_temp = $${:catalina_base}/temp
catalina_webapps = $${:catalina_base}/webapps catalina_webapps = $${:catalina_base}/webapps
catalina_work = $${:catalina_base}/work catalina_work = $${:catalina_base}/work
catalina_conf = $${:catalina_base}/conf catalina_conf = $${:catalina_base}/conf
\ No newline at end of file
software/plantuml/test/test.py
View file @ 826371fd
...@@ -158,8 +158,8 @@ class ServicesTestCase(PlantUMLTestCase): ...@@ -158,8 +158,8 @@ class ServicesTestCase(PlantUMLTestCase):
def test_hashes(self): def test_hashes(self):
hash_files = [ hash_files = [
'software_release/buildout.cfg', 'var/tomcat/conf/server.xml',
'var/tomcat/conf/server.xml' 'software_release/buildout.cfg'
] ]
expected_process_names = [ expected_process_names = [
'tomcat-instance-{hash}-on-watch', 'tomcat-instance-{hash}-on-watch',
......
software/powerdns/instance-powerdns.cfg
View file @ 826371fd
...@@ -86,7 +86,7 @@ extra-context = ...@@ -86,7 +86,7 @@ extra-context =
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${powerdns:location}/sbin/pdns_server --config-dir=$${pdns-directory:configuration} command-line = ${powerdns:location}/sbin/pdns_server --config-dir=$${pdns-directory:configuration}
wrapper-path = $${directory:service}/pdns wrapper-path = $${directory:service}/pdns
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[pdns-reload] [pdns-reload]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
software/powerdns/software.cfg
View file @ 826371fd
...@@ -25,7 +25,7 @@ mode = 0644 ...@@ -25,7 +25,7 @@ mode = 0644
[template-powerdns] [template-powerdns]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-powerdns.cfg url = ${:_profile_base_location_}/instance-powerdns.cfg
md5sum = b2301de110ba95be46121dc18d7ca544 md5sum = 5077ba344b641fa9703f9872a974d3d7
output = ${buildout:directory}/template-powerdns.cfg output = ${buildout:directory}/template-powerdns.cfg
mode = 0644 mode = 0644
......
software/re6stnet/instance-re6stnet.cfg.in
View file @ 826371fd
...@@ -92,7 +92,7 @@ cert-file = ${certificate-authority:ca-certs}/apache.crt ...@@ -92,7 +92,7 @@ cert-file = ${certificate-authority:ca-certs}/apache.crt
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${apache-ca:wrapper} command-line = ${apache-ca:wrapper}
wrapper-path = ${directory:services}/httpd wrapper-path = ${directory:services}/httpd
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
{% endif %} {% endif %}
[apache-httpd-graceful] [apache-httpd-graceful]
......
software/re6stnet/software.cfg
View file @ 826371fd
...@@ -86,7 +86,7 @@ extra-context = ...@@ -86,7 +86,7 @@ extra-context =
[template-re6stnet] [template-re6stnet]
< = download-base < = download-base
filename = instance-re6stnet.cfg.in filename = instance-re6stnet.cfg.in
md5sum = 09683c66c16361b77867d8f2e1140a35 md5sum = 73c8fad6db7c711b0822891aba574564
[template-apache-conf] [template-apache-conf]
< = download-base < = download-base
......
software/slaprunner/buildout.hash.cfg
View file @ 826371fd
...@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44 ...@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
[template-runner] [template-runner]
filename = instance-runner.cfg filename = instance-runner.cfg
md5sum = 48bff0b5f082f22d44966b1151f07133 md5sum = 58a6f21021279ae52c91813f61cdbdd7
[template-runner-import-script] [template-runner-import-script]
filename = template/runner-import.sh.jinja2 filename = template/runner-import.sh.jinja2
......
software/slaprunner/instance-runner.cfg
View file @ 826371fd
...@@ -212,7 +212,7 @@ recipe = slapos.cookbook:wrapper ...@@ -212,7 +212,7 @@ recipe = slapos.cookbook:wrapper
# XXX hardcoded locations # XXX hardcoded locations
command-line = $${directory:bin}/slapos node supervisord --cfg $${directory:etc}/slapos.cfg -n command-line = $${directory:bin}/slapos node supervisord --cfg $${directory:etc}/slapos.cfg -n
wrapper-path = $${directory:services}/slaprunner-supervisord wrapper-path = $${directory:services}/slaprunner-supervisord
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[test-runner] [test-runner]
...@@ -303,7 +303,7 @@ keygen-binary = ${openssh:location}/bin/ssh-keygen ...@@ -303,7 +303,7 @@ keygen-binary = ${openssh:location}/bin/ssh-keygen
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${runner-sshkeys-authority:wrapper} command-line = $${runner-sshkeys-authority:wrapper}
wrapper-path = $${directory:services}/runner-sshkeys-authority wrapper-path = $${directory:services}/runner-sshkeys-authority
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[runner-sshkeys-sshd] [runner-sshkeys-sshd]
<= runner-sshkeys-authority <= runner-sshkeys-authority
...@@ -319,7 +319,7 @@ wrapper = $${directory:bin}/runner-sshd ...@@ -319,7 +319,7 @@ wrapper = $${directory:bin}/runner-sshd
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${runner-sshkeys-sshd:wrapper} command-line = $${runner-sshkeys-sshd:wrapper}
wrapper-path = $${directory:services}/runner-sshd wrapper-path = $${directory:services}/runner-sshd
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[runner-sshd-add-authorized-key] [runner-sshd-add-authorized-key]
recipe = slapos.cookbook:dropbear.add_authorized_key recipe = slapos.cookbook:dropbear.add_authorized_key
...@@ -431,7 +431,7 @@ access-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global ...@@ -431,7 +431,7 @@ access-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global
wait-for-files = wait-for-files =
$${ca-nginx:cert-file} $${ca-nginx:cert-file}
$${ca-nginx:key-file} $${ca-nginx:key-file}
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[logrotate-entry-apache-httpd] [logrotate-entry-apache-httpd]
<= logrotate-entry-base <= logrotate-entry-base
...@@ -482,7 +482,7 @@ wrapper-path = $${gunicorn:bin_launcher} ...@@ -482,7 +482,7 @@ wrapper-path = $${gunicorn:bin_launcher}
environment = PATH=$${shell-environment:path} environment = PATH=$${shell-environment:path}
RUNNER_CONFIG=$${slaprunner:slapos.cfg} RUNNER_CONFIG=$${slaprunner:slapos.cfg}
LANG=en_GB.UTF-8 LANG=en_GB.UTF-8
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[gunicorn-graceful] [gunicorn-graceful]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
...@@ -526,13 +526,13 @@ name = example.com ...@@ -526,13 +526,13 @@ name = example.com
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/nginx-frontend command-line = $${directory:bin}/nginx-frontend
wrapper-path = $${directory:services}/nginx-frontend wrapper-path = $${directory:services}/nginx-frontend
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[certificate-authority-service] [certificate-authority-service]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/certificate_authority command-line = $${directory:bin}/certificate_authority
wrapper-path = $${directory:services}/certificate_authority wrapper-path = $${directory:services}/certificate_authority
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
#-------------------- #--------------------
#-- #--
...@@ -706,7 +706,7 @@ template = inline: ...@@ -706,7 +706,7 @@ template = inline:
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/shellinaboxd command-line = $${directory:bin}/shellinaboxd
wrapper-path = $${directory:services}/shellinaboxd wrapper-path = $${directory:services}/shellinaboxd
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[shell-environment] [shell-environment]
shell = ${bash:location}/bin/bash shell = ${bash:location}/bin/bash
...@@ -840,7 +840,7 @@ context = ...@@ -840,7 +840,7 @@ context =
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${buildout:directory}/bin/supervisord -c $${supervisord-conf:rendered} --nodaemon command-line = $${buildout:directory}/bin/supervisord -c $${supervisord-conf:rendered} --nodaemon
wrapper-path = $${directory:services}/supervisord wrapper-path = $${directory:services}/supervisord
hash-files = $${buildout:directory}/software_release/buildout.cfg hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
[logrotate-entry-supervisord] [logrotate-entry-supervisord]
<= logrotate-entry-base <= logrotate-entry-base
......
software/turnserver/instance-turnserver.cfg.jinja2.in
View file @ 826371fd
...@@ -112,7 +112,7 @@ recipe = slapos.cookbook:wrapper ...@@ -112,7 +112,7 @@ recipe = slapos.cookbook:wrapper
command-line = {{ parameter_dict['turnserver-location'] }}/bin/turnserver command-line = {{ parameter_dict['turnserver-location'] }}/bin/turnserver
-c ${turnserver-config:output} -c ${turnserver-config:output}
wrapper-path = ${directory:services}/turnserver wrapper-path = ${directory:services}/turnserver
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[promise-check-turnserver-port] [promise-check-turnserver-port]
<= monitor-promise-base <= monitor-promise-base
......
software/turnserver/software.cfg
View file @ 826371fd
...@@ -29,7 +29,7 @@ md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3 ...@@ -29,7 +29,7 @@ md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3
[template-turnserver] [template-turnserver]
<= download-base <= download-base
filename = instance-turnserver.cfg.jinja2.in filename = instance-turnserver.cfg.jinja2.in
md5sum = 02bddf180519f7649d3b1f997a496eed md5sum = f275df4900a9db1d1a72b67b12ee8afe
[versions] [versions]
slapos.recipe.template = 4.3 slapos.recipe.template = 4.3
\ No newline at end of file
stack/lamp/buildout.cfg
View file @ 826371fd
...@@ -120,7 +120,7 @@ context = ...@@ -120,7 +120,7 @@ context =
<= template-download-base <= template-download-base
filename = instance-apache-php.cfg.in filename = instance-apache-php.cfg.in
output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename} output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
md5sum = 44796786448fd0319dde14923fbd798b md5sum = 9d3eb7fcc44ac25bef8ee9df6eac8974
[instance-lamp] [instance-lamp]
<= template-download-base <= template-download-base
......
stack/lamp/instance-apache-php.cfg.in
View file @ 826371fd
...@@ -74,7 +74,7 @@ ca-crl = ${ca-directory:crl} ...@@ -74,7 +74,7 @@ ca-crl = ${ca-directory:crl}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${certificate-authority:wrapper} command-line = ${certificate-authority:wrapper}
wrapper-path = ${directory:services}/certificate_authority wrapper-path = ${directory:services}/certificate_authority
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[ca-apache-php] [ca-apache-php]
<= certificate-authority <= certificate-authority
...@@ -88,7 +88,7 @@ wrapper = ${directory:bin}/ca-apache-php ...@@ -88,7 +88,7 @@ wrapper = ${directory:bin}/ca-apache-php
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${ca-apache-php:wrapper} command-line = ${ca-apache-php:wrapper}
wrapper-path = ${directory:services}/apache-php wrapper-path = ${directory:services}/apache-php
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
depends = depends =
${copy-application:recipe} ${copy-application:recipe}
${apache-graceful:recipe} ${apache-graceful:recipe}
......
stack/logrotate/buildout.hash.cfg
View file @ 826371fd
...@@ -22,4 +22,4 @@ md5sum = 117e46af6d9d31c09eeb86089d11407e ...@@ -22,4 +22,4 @@ md5sum = 117e46af6d9d31c09eeb86089d11407e
[template-logrotate-base] [template-logrotate-base]
filename = instance-logrotate-base.cfg.in filename = instance-logrotate-base.cfg.in
md5sum = 338be3ee006c08b26abcc023f398247e md5sum = c2a06234d923c8e589cc0ddb1d6e0880
stack/logrotate/instance-logrotate-base.cfg.in
View file @ 826371fd
...@@ -20,7 +20,7 @@ service = ${cron-service:wrapper-path} ...@@ -20,7 +20,7 @@ service = ${cron-service:wrapper-path}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${cron:binary} command-line = ${cron:binary}
wrapper-path = ${logrotate-directory:services}/crond wrapper-path = ${logrotate-directory:services}/crond
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[cron-simplelogger] [cron-simplelogger]
recipe = slapos.cookbook:simplelogger recipe = slapos.cookbook:simplelogger
......
stack/monitor/buildout.hash.cfg
View file @ 826371fd
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,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 = c0856969ea372d49ab60ba07b3bf2a51 md5sum = d3d5a44db790f2bdf4fcbe6ebffe261f
stack/monitor/instance-monitor.cfg.jinja2.in
View file @ 826371fd
...@@ -61,7 +61,7 @@ ca-crl = ${ca-directory:crl} ...@@ -61,7 +61,7 @@ ca-crl = ${ca-directory:crl}
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${certificate-authority:wrapper} command-line = ${certificate-authority:wrapper}
wrapper-path = ${directory:services}/certificate_authority wrapper-path = ${directory:services}/certificate_authority
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[ca-monitor-httpd] [ca-monitor-httpd]
<= certificate-authority <= certificate-authority
...@@ -75,7 +75,7 @@ wrapper = ${directory:bin}/ca-monitor-httpd ...@@ -75,7 +75,7 @@ wrapper = ${directory:bin}/ca-monitor-httpd
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = ${ca-monitor-httpd:wrapper} command-line = ${ca-monitor-httpd:wrapper}
wrapper-path = ${directory:services}/monitor-httpd wrapper-path = ${directory:services}/monitor-httpd
hash-files = ${buildout:directory}/software_release/buildout.cfg hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
[monitor-conf-parameters] [monitor-conf-parameters]
title = ${monitor-instance-parameter:monitor-title} title = ${monitor-instance-parameter:monitor-title}
......
stack/slapos.cfg
View file @ 826371fd
...@@ -136,7 +136,7 @@ pyparsing = 2.2.0 ...@@ -136,7 +136,7 @@ pyparsing = 2.2.0
pytz = 2016.10 pytz = 2016.10
requests = 2.13.0 requests = 2.13.0
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.121 slapos.cookbook = 1.0.123
slapos.core = 1.4.28 slapos.core = 1.4.28
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7