Skip to content

slapos
slapos
Commit 0aecb41a authored by Łukasz Nowak's avatar Łukasz Nowak
4 Browse files
Options

software: Use local tmp for caucase

parent 67c1d2b4
Pipeline #15732 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 16 additions and 7 deletions
    software/caddy-frontend/buildout.hash.cfg
    View file @ 0aecb41a
    ...@@ -26,7 +26,7 @@ md5sum = dd6542a91746e6e3720eaa1590792dbe ...@@ -26,7 +26,7 @@ md5sum = dd6542a91746e6e3720eaa1590792dbe
    [profile-caddy-replicate] [profile-caddy-replicate]
    filename = instance-apache-replicate.cfg.in filename = instance-apache-replicate.cfg.in
    md5sum = 1248911409cbeea980a838b04ee451d2 md5sum = ec421617d4932e8e1ae1e55a41fbfaab
    [profile-slave-list] [profile-slave-list]
    _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
    ...@@ -106,7 +106,7 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8 ...@@ -106,7 +106,7 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
    [profile-kedifa] [profile-kedifa]
    filename = instance-kedifa.cfg.in filename = instance-kedifa.cfg.in
    md5sum = 3daebc4b37088fa01183a853920d4143 md5sum = 225ce18b9218de4169327a206051a92e
    [template-backend-haproxy-rsyslogd-conf] [template-backend-haproxy-rsyslogd-conf]
    _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in
    ......
    software/caddy-frontend/instance-apache-replicate.cfg.in
    View file @ 0aecb41a
    ...@@ -474,6 +474,7 @@ kedifa = ${request-kedifa:connection-monitor-base-url} ...@@ -474,6 +474,7 @@ kedifa = ${request-kedifa:connection-monitor-base-url}
    recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
    bin = ${buildout:directory}/bin/ bin = ${buildout:directory}/bin/
    srv = ${buildout:directory}/srv/ srv = ${buildout:directory}/srv/
    tmp = ${buildout:directory}/tmp/
    backup = ${:srv}/backup backup = ${:srv}/backup
    # CAUCASE directories # CAUCASE directories
    caucased = ${:srv}/caucased caucased = ${:srv}/caucased
    ...@@ -887,9 +888,10 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg ...@@ -887,9 +888,10 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
    backup_dir='${directory:backup-caucased}', backup_dir='${directory:backup-caucased}',
    data_dir='${directory:caucased}', data_dir='${directory:caucased}',
    netloc=caucase_netloc, netloc=caucase_netloc,
    tmp='${directory:tmp}',
    service_auto_approve_count=0, service_auto_approve_count=0,
    user_auto_approve_count=1, user_auto_approve_count=1,
    key_len=2048, key_len=2048
    )}} )}}
    [buildout] [buildout]
    ......
    software/caddy-frontend/instance-kedifa.cfg.in
    View file @ 0aecb41a
    ...@@ -41,9 +41,10 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg ...@@ -41,9 +41,10 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
    backup_dir='${directory:backup-caucased}', backup_dir='${directory:backup-caucased}',
    data_dir='${directory:caucased}', data_dir='${directory:caucased}',
    netloc=caucase_netloc, netloc=caucase_netloc,
    tmp='${directory:tmp}',
    service_auto_approve_count=0, service_auto_approve_count=0,
    user_auto_approve_count=1, user_auto_approve_count=1,
    key_len=2048, key_len=2048
    )}} )}}
    # Create all needed directories # Create all needed directories
    ......
    software/caucase/buildout.hash.cfg
    View file @ 0aecb41a
    ...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
    # not need these here). # not need these here).
    [instance-caucased] [instance-caucased]
    filename = instance-caucased.cfg.jinja2 filename = instance-caucased.cfg.jinja2
    md5sum = 8081efb41f12592033283db9841178ea md5sum = 2e7c1d8c553b398dd68c875a9fa38cdb
    [instance] [instance]
    filename = instance.cfg.jinja2 filename = instance.cfg.jinja2
    ......
    software/caucase/instance-caucased.cfg.jinja2
    View file @ 0aecb41a
    ...@@ -6,6 +6,7 @@ recipe = slapos.cookbook:mkdirectory ...@@ -6,6 +6,7 @@ recipe = slapos.cookbook:mkdirectory
    etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
    service-on-watch = ${:etc}/service service-on-watch = ${:etc}/service
    srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
    tmp = ${buildout:directory}/tmp
    {{ caucase.caucased( {{ caucase.caucased(
    prefix='caucased', prefix='caucased',
    ...@@ -13,6 +14,7 @@ srv = ${buildout:directory}/srv ...@@ -13,6 +14,7 @@ srv = ${buildout:directory}/srv
    caucased_path='${directory:service-on-watch}/caucased', caucased_path='${directory:service-on-watch}/caucased',
    data_dir='${directory:srv}/caucased', data_dir='${directory:srv}/caucased',
    netloc=netloc, netloc=netloc,
    tmp='%{directory:tmp}',
    Please register or sign in to reply
    service_auto_approve_count=slapparameter_dict.get('service-auto-approve-amount', 0), service_auto_approve_count=slapparameter_dict.get('service-auto-approve-amount', 0),
    user_auto_approve_count=slapparameter_dict.get('user-auto-approve-amount', 1), user_auto_approve_count=slapparameter_dict.get('user-auto-approve-amount', 1),
    key_len=slapparameter_dict.get('key-length', 2048), key_len=slapparameter_dict.get('key-length', 2048),
    ......
    software/slapos-master/buildout.hash.cfg
    View file @ 0aecb41a
    ...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
    # not need these here). # not need these here).
    [template-erp5] [template-erp5]
    filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
    md5sum = eba73f868a5bbfb942323eadcd88cb16 md5sum = 2b91d77011cb50b3bd4264b1d80252b1
    [template-balancer] [template-balancer]
    filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
    ......
    software/slapos-master/instance-erp5.cfg.in
    View file @ 0aecb41a
    ...@@ -89,6 +89,7 @@ backup-caucased = ${:srv}/backup/caucased ...@@ -89,6 +89,7 @@ backup-caucased = ${:srv}/backup/caucased
    backup_dir='${directory:backup-caucased}', backup_dir='${directory:backup-caucased}',
    data_dir='${directory:srv}/caucased', data_dir='${directory:srv}/caucased',
    netloc=caucase_netloc, netloc=caucase_netloc,
    tmp='${directory:tmp}',
    service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1), service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
    user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0), user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
    key_len=caucase_dict.get('key-length', 2048), key_len=caucase_dict.get('key-length', 2048),
    ...@@ -374,6 +375,7 @@ ca-dir = ${buildout:directory}/srv/ssl ...@@ -374,6 +375,7 @@ ca-dir = ${buildout:directory}/srv/ssl
    {% endif -%} {% endif -%}
    bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
    etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
    tmp = ${buildout:directory}/tmp
    services = ${:etc}/run services = ${:etc}/run
    requests = ${:ca-dir}/requests requests = ${:ca-dir}/requests
    private = ${:ca-dir}/private private = ${:ca-dir}/private
    ......
    stack/erp5/buildout.hash.cfg
    View file @ 0aecb41a
    ...@@ -74,7 +74,7 @@ md5sum = 8bd7f89b7c1e453ecc952659a01347e6 ...@@ -74,7 +74,7 @@ md5sum = 8bd7f89b7c1e453ecc952659a01347e6
    [template-erp5] [template-erp5]
    filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
    md5sum = 79f092c54998918423257f4b676425ea md5sum = aea5ab7b58beae9ada8b14f1c548e493
    [template-zeo] [template-zeo]
    filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
    ......
    stack/erp5/instance-erp5.cfg.in
    View file @ 0aecb41a
    ...@@ -71,6 +71,7 @@ recipe = slapos.cookbook:mkdirectory ...@@ -71,6 +71,7 @@ recipe = slapos.cookbook:mkdirectory
    bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
    service-on-watch = ${buildout:directory}/etc/service service-on-watch = ${buildout:directory}/etc/service
    srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
    tmp = {$buildout:directory}/tmp
    Please register or sign in to reply
    backup-caucased = ${:srv}/backup/caucased backup-caucased = ${:srv}/backup/caucased
    {% if not caucase_url -%} {% if not caucase_url -%}
    ...@@ -89,6 +90,7 @@ backup-caucased = ${:srv}/backup/caucased ...@@ -89,6 +90,7 @@ backup-caucased = ${:srv}/backup/caucased
    backup_dir='${directory:backup-caucased}', backup_dir='${directory:backup-caucased}',
    data_dir='${directory:srv}/caucased', data_dir='${directory:srv}/caucased',
    netloc=caucase_netloc, netloc=caucase_netloc,
    tmp='${directory:tmp}',
    service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1), service_auto_approve_count=caucase_dict.get('service-auto-approve-amount', 1),
    user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0), user_auto_approve_count=caucase_dict.get('user-auto-approve-amount', 0),
    key_len=caucase_dict.get('key-length', 2048), key_len=caucase_dict.get('key-length', 2048),
    ......
    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