Skip to content

slapos
slapos
Commit c6cc45ab authored by Jérome Perrin's avatar Jérome Perrin
1 Browse files
Options

all: apply eclint to unify empty lines at end of file 

done with:

     npm install
     git ls-files | grep -v '\/unstable\/' | xargs ./node_modules/.bin/eclint fix
     git ls-files | grep buildout.hash.cfg | xargs ./update-hash
parent b0c23ab5
Pipeline #10837 canceled with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 144 additions and 193 deletions
    component/apache/apache-backend.conf.in
    View file @ c6cc45ab
    ...@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }} ...@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }}
    RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P] RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P]
    {% endfor -%} {% endfor -%}
    </VirtualHost> </VirtualHost>
    {% endfor -%} {% endfor -%}
    \ No newline at end of file
    component/apache/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
    # not need these here). # not need these here).
    [template-apache-backend-conf] [template-apache-backend-conf]
    filename = apache-backend.conf.in filename = apache-backend.conf.in
    md5sum = ace264843228af84d025797f520ce70f md5sum = 6f51eaa9930e7a7ef959de7c510c7c2f
    component/matplotlib/buildout.hash.cfg
    View file @ c6cc45ab
    [matplotlibrc] [matplotlibrc]
    filename = matplotlibrc.in filename = matplotlibrc.in
    md5sum = 849f48f08bea21dd10d3825867cb1561 md5sum = 47a737b8f4db0b329e2b3fd70e5a325c
    component/matplotlib/matplotlibrc.in
    View file @ c6cc45ab
    backend : {{ backend }} backend : {{ backend }}
    \ No newline at end of file
    component/r-language/software.cfg
    View file @ c6cc45ab
    ...@@ -14,4 +14,3 @@ recipe = zc.recipe.egg ...@@ -14,4 +14,3 @@ recipe = zc.recipe.egg
    eggs = eggs =
    ${lxml-python:egg} ${lxml-python:egg}
    slapos.cookbook slapos.cookbook
    slapos/recipe/accords/template/accords.ini.in
    View file @ c6cc45ab
    ...@@ -32,4 +32,4 @@ resthost=%(listen_ip)s ...@@ -32,4 +32,4 @@ resthost=%(listen_ip)s
    #operator=accords #operator=accords
    # Password (default: co-system) # Password (default: co-system)
    #password=co-system #password=co-system
    \ No newline at end of file
    slapos/recipe/accords/template/os_config.xml.in
    View file @ c6cc45ab
    ...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
    tls="0" tls="0"
    current="0" current="0"
    /> />
    </os_configs> </os_configs>
    \ No newline at end of file
    slapos/recipe/check_parameter/template/check_parameter.py.in
    View file @ c6cc45ab
    ...@@ -15,4 +15,3 @@ if expected != "" and value != expected: ...@@ -15,4 +15,3 @@ if expected != "" and value != expected:
    if not_expected != "" and value == not_expected: if not_expected != "" and value == not_expected:
    print "FAIL: %%s == %%s" %% (value, not_expected) print "FAIL: %%s == %%s" %% (value, not_expected)
    sys.exit(127) sys.exit(127)
    slapos/recipe/davstorage/template/httpd.conf.in
    View file @ c6cc45ab
    ...@@ -121,4 +121,4 @@ TypesConfig "%(mime_types)s" ...@@ -121,4 +121,4 @@ TypesConfig "%(mime_types)s"
    AddType application/x-compress .Z AddType application/x-compress .Z
    AddType application/x-gzip .gz .tgz AddType application/x-gzip .gz .tgz
    AddType application/x-httpd-php .php .phtml .php5 .php4 AddType application/x-httpd-php .php .phtml .php5 .php4
    AddType application/x-httpd-php-source .phps AddType application/x-httpd-php-source .phps
    \ No newline at end of file
    slapos/recipe/davstorage/template/php.ini.in
    View file @ c6cc45ab
    ...@@ -16,4 +16,4 @@ file_uploads = On ...@@ -16,4 +16,4 @@ file_uploads = On
    upload_max_filesize = 8M upload_max_filesize = 8M
    post_max_size = 8M post_max_size = 8M
    magic_quotes_gpc=Off magic_quotes_gpc=Off
    output_buffering=Off output_buffering=Off
    \ No newline at end of file
    slapos/recipe/re6stnet/template/registry-run.in
    View file @ c6cc45ab
    ...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
    echo $$ > %(pid_file)s echo $$ > %(pid_file)s
    exec %(command)s \ exec %(command)s \
    %(parameter)s %(parameter)s
    \ No newline at end of file
    slapos/recipe/zeo/template/zeo-filestorage-snippet.conf.in
    View file @ c6cc45ab
    ...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
    path %(path)s path %(path)s
    # pack-gc false # pack-gc false
    </filestorage> </filestorage>
    software/agent/software.cfg
    View file @ c6cc45ab
    ...@@ -50,4 +50,3 @@ pycurl = 7.43.0 ...@@ -50,4 +50,3 @@ pycurl = 7.43.0
    slapos.recipe.download = 1.0 slapos.recipe.download = 1.0
    slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
    smmap = 0.9.0 smmap = 0.9.0
    software/ajaxplorer/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
    # not need these here). # not need these here).
    [instance] [instance]
    filename = instance.cfg filename = instance.cfg
    md5sum = 4c7936accb3658871b635158198b7905 md5sum = 1fbb72e4305ded9614ee80c0ee17b672
    [instance-apache] [instance-apache]
    filename = instance-apachephp.cfg filename = instance-apachephp.cfg
    ...@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1 ...@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1
    [template-httpd-conf-hash] [template-httpd-conf-hash]
    filename = templates/apache.conf.in filename = templates/apache.conf.in
    md5sum = 6788381fadd8ca96f892d33df3163da0 md5sum = 4fc3f853abf702aeb6653942d4fb85d8
    software/ajaxplorer/instance.cfg
    View file @ c6cc45ab
    ...@@ -9,4 +9,4 @@ offline = true ...@@ -9,4 +9,4 @@ offline = true
    [switch_softwaretype] [switch_softwaretype]
    recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
    default = ${instance-apache:output} default = ${instance-apache:output}
    mariadb = ${instance-mariadb:output} mariadb = ${instance-mariadb:output}
    \ No newline at end of file
    software/ajaxplorer/templates/apache.conf.in
    View file @ c6cc45ab
    ...@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so ...@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so
    LoadModule headers_module modules/mod_headers.so LoadModule headers_module modules/mod_headers.so
    LoadModule dir_module modules/mod_dir.so LoadModule dir_module modules/mod_dir.so
    LoadModule php5_module modules/libphp5.so LoadModule php5_module modules/libphp5.so
    LoadModule alias_module modules/mod_alias.so LoadModule alias_module modules/mod_alias.so
    \ No newline at end of file
    software/apache-frontend/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
    # not need these here). # not need these here).
    [template] [template]
    filename = instance.cfg filename = instance.cfg
    md5sum = f686f765e55d1dce2e55a400f0714b3e md5sum = 4adae801babadd9aed6112c1ff209076
    [template-apache-frontend] [template-apache-frontend]
    filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
    ...@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0 ...@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0
    [template-replicate-publish-slave-information] [template-replicate-publish-slave-information]
    filename = templates/replicate-publish-slave-information.cfg.in filename = templates/replicate-publish-slave-information.cfg.in
    md5sum = 665e83d660c9b779249b2179d7ce4b4e md5sum = 7c0025a35dc62eb3cbfd07a6b04d659e
    [template-apache-frontend-configuration] [template-apache-frontend-configuration]
    filename = templates/apache.conf.in filename = templates/apache.conf.in
    ...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b ...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
    [template-default-virtualhost] [template-default-virtualhost]
    filename = templates/000.conf.in filename = templates/000.conf.in
    md5sum = d98a01182f38868612948c87d5231428 md5sum = 5fcc11ea7f3eae38b0135b94dfc42dd5
    [template-default-slave-virtualhost] [template-default-slave-virtualhost]
    filename = templates/default-virtualhost.conf.in filename = templates/default-virtualhost.conf.in
    ...@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52 ...@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52
    [template-cached-slave-virtualhost] [template-cached-slave-virtualhost]
    filename = templates/cached-virtualhost.conf.in filename = templates/cached-virtualhost.conf.in
    md5sum = 1a1a53d9ac4a1591c017d86850a94796 md5sum = f97dfcfae80527e242f285c9ebf11b27
    [template-log-access] [template-log-access]
    filename = templates/template-log-access.conf.in filename = templates/template-log-access.conf.in
    ...@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d ...@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d
    [template-empty] [template-empty]
    filename = templates/empty.in filename = templates/empty.in
    md5sum = c2314c3a9c3412a38d14b312d3df83c1 md5sum = 7155b18edfe128825b8d1f48071454a6
    [template-wrapper] [template-wrapper]
    filename = templates/wrapper.in filename = templates/wrapper.in
    md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
    [template-trafficserver-records-config] [template-trafficserver-records-config]
    filename = templates/trafficserver/records.config.jinja2 filename = templates/trafficserver/records.config.jinja2
    ...@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2 ...@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2
    [template-apache-lazy-script-call] [template-apache-lazy-script-call]
    filename = templates/apache-lazy-script-call.sh.in filename = templates/apache-lazy-script-call.sh.in
    md5sum = ebe5d3d19923eb812a40019cb11276d8 md5sum = 44e235d0451932f1232f9d9e0ecc59f9
    [template-apache-graceful-script] [template-apache-graceful-script]
    filename = templates/apache-graceful-script.sh.in filename = templates/apache-graceful-script.sh.in
    ......
    software/apache-frontend/instance.cfg
    View file @ c6cc45ab
    ...@@ -47,4 +47,3 @@ extra-context = ...@@ -47,4 +47,3 @@ extra-context =
    # Must match the key id in [switch-softwaretype] which uses this section. # Must match the key id in [switch-softwaretype] which uses this section.
    raw software_type RootSoftwareInstance-default-custom-personal-replicate raw software_type RootSoftwareInstance-default-custom-personal-replicate
    raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
    software/apache-frontend/software.cfg
    View file @ c6cc45ab
    ...@@ -14,4 +14,3 @@ smmap = 0.9.0 ...@@ -14,4 +14,3 @@ smmap = 0.9.0
    numpy = 1.16.4 numpy = 1.16.4
    websockify = 0.8.0 websockify = 0.8.0
    software/apache-frontend/templates/000.conf.in
    View file @ c6cc45ab
    ...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
    ServerName www.example.org ServerName www.example.org
    ErrorDocument 404 /notfound.html ErrorDocument 404 /notfound.html
    </VirtualHost> </VirtualHost>
    \ No newline at end of file
    software/apache-frontend/templates/apache-lazy-script-call.sh.in
    View file @ c6cc45ab
    ...@@ -19,4 +19,3 @@ else ...@@ -19,4 +19,3 @@ else
    {{ lazy_command }} {{ lazy_command }}
    fi fi
    fi fi
    software/apache-frontend/templates/cached-virtualhost.conf.in
    View file @ c6cc45ab
    ...@@ -48,4 +48,3 @@ ...@@ -48,4 +48,3 @@
    RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P] RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
    </VirtualHost> </VirtualHost>
    software/apache-frontend/templates/empty.in
    View file @ c6cc45ab
    {{ content }} {{ content }}
    \ No newline at end of file
    software/apache-frontend/templates/replicate-publish-slave-information.cfg.in
    View file @ c6cc45ab
    ...@@ -48,4 +48,4 @@ parts = ...@@ -48,4 +48,4 @@ parts =
    eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
    develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
    offline = true offline = true
    \ No newline at end of file
    software/apache-frontend/templates/wrapper.in
    View file @ c6cc45ab
    #!${dash-output:dash} #!${dash-output:dash}
    {{ content }} {{ content }}
    \ No newline at end of file
    software/backupserver/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b ...@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
    [template-nginx-configuration] [template-nginx-configuration]
    filename = template-nginx.cfg.in filename = template-nginx.cfg.in
    md5sum = a7012aac9b47ddd4e3aa3197aee1ffac md5sum = fc4f258e3ae56e0c9596484d736ccfed
    [template-dcron-service] [template-dcron-service]
    filename = template-dcron-service.sh.in filename = template-dcron-service.sh.in
    ...@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e ...@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e
    [template-crontab] [template-crontab]
    filename = template-crontab.in filename = template-crontab.in
    md5sum = 072be0fd04896880c931d44d8eabde37 md5sum = f1f82101258de19068262b7213fc478b
    [status2rss] [status2rss]
    filename = status2rss.py filename = status2rss.py
    ......
    software/backupserver/template-crontab.in
    View file @ c6cc45ab
    # min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command # min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command
    MAILTO=admins@erp5.org MAILTO=admins@erp5.org
    software/backupserver/template-nginx.cfg.in
    View file @ c6cc45ab
    ...@@ -81,4 +81,3 @@ server { ...@@ -81,4 +81,3 @@ server {
    } }
    } }
    software/caddy-frontend/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -18,7 +18,7 @@ md5sum = dae3bf6daf851b5610a1a6bd83057b29 ...@@ -18,7 +18,7 @@ md5sum = dae3bf6daf851b5610a1a6bd83057b29
    [template-common] [template-common]
    filename = instance-common.cfg.in filename = instance-common.cfg.in
    md5sum = c801b7f9f11f0965677c22e6bbe9281b md5sum = 5784bea3bd608913769ff9a8afcccb68
    [template-apache-frontend] [template-apache-frontend]
    filename = instance-apache-frontend.cfg.in filename = instance-apache-frontend.cfg.in
    ...@@ -62,11 +62,11 @@ md5sum = f8068179333ce19e95df561c70073857 ...@@ -62,11 +62,11 @@ md5sum = f8068179333ce19e95df561c70073857
    [template-empty] [template-empty]
    _update_hash_filename_ = templates/empty.in _update_hash_filename_ = templates/empty.in
    md5sum = c2314c3a9c3412a38d14b312d3df83c1 md5sum = 7155b18edfe128825b8d1f48071454a6
    [template-wrapper] [template-wrapper]
    _update_hash_filename_ = templates/wrapper.in _update_hash_filename_ = templates/wrapper.in
    md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
    [template-trafficserver-records-config] [template-trafficserver-records-config]
    _update_hash_filename_ = templates/trafficserver/records.config.jinja2 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
    ...@@ -86,7 +86,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184 ...@@ -86,7 +86,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184
    [template-caddy-lazy-script-call] [template-caddy-lazy-script-call]
    _update_hash_filename_ = templates/apache-lazy-script-call.sh.in _update_hash_filename_ = templates/apache-lazy-script-call.sh.in
    md5sum = b9f73f6323f9fceea054c46c854d2862 md5sum = 77d60840591de67b64ab3572e46273a0
    [template-graceful-script] [template-graceful-script]
    _update_hash_filename_ = templates/graceful-script.sh.in _update_hash_filename_ = templates/graceful-script.sh.in
    ......
    software/caddy-frontend/instance-common.cfg.in
    View file @ c6cc45ab
    ...@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id} ...@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id}
    server_url = ${slap-connection:server-url} server_url = ${slap-connection:server-url}
    software_release_url = ${slap-connection:software-release-url} software_release_url = ${slap-connection:software-release-url}
    key_file = ${slap-connection:key-file} key_file = ${slap-connection:key-file}
    cert_file = ${slap-connection:cert-file} cert_file = ${slap-connection:cert-file}
    \ No newline at end of file
    software/caddy-frontend/templates/apache-lazy-script-call.sh.in
    View file @ c6cc45ab
    ...@@ -21,4 +21,3 @@ else ...@@ -21,4 +21,3 @@ else
    rm -f $PIDFILE rm -f $PIDFILE
    fi fi
    fi fi
    software/caddy-frontend/templates/empty.in
    View file @ c6cc45ab
    {{ content }} {{ content }}
    \ No newline at end of file
    software/caddy-frontend/templates/wrapper.in
    View file @ c6cc45ab
    #!${dash-output:dash} #!${dash-output:dash}
    {{ content }} {{ content }}
    \ No newline at end of file
    software/davstorage/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299 ...@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299
    [instance-davstorage] [instance-davstorage]
    filename = instance-davstorage.cfg filename = instance-davstorage.cfg
    md5sum = b83b0351a0f46aac35d52e681270ff03 md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a
    software/davstorage/instance-davstorage.cfg
    View file @ c6cc45ab
    ...@@ -187,4 +187,4 @@ return = domain ...@@ -187,4 +187,4 @@ return = domain
    #path = $${basedirectory:promises}/frontend-ajaxupload #path = $${basedirectory:promises}/frontend-ajaxupload
    #url = $${request-frontend-ajaxupload:connection-site_url} #url = $${request-frontend-ajaxupload:connection-site_url}
    #dash_path = ${dash:location}/bin/dash #dash_path = ${dash:location}/bin/dash
    #curl_path = ${curl:location}/bin/curl #curl_path = ${curl:location}/bin/curl
    \ No newline at end of file
    software/dream/buildout.hash.cfg
    View file @ c6cc45ab
    [instance] [instance]
    filename = instance.cfg filename = instance.cfg
    md5sum = 94e1cd21bbdf7cabb5834223859407e0 md5sum = 646e50cfa93681e8bd85767621c7a39d
    \ No newline at end of file \ No newline at end of file
    software/dream/instance.cfg
    View file @ c6cc45ab
    ...@@ -75,4 +75,3 @@ log = $${:var}/log ...@@ -75,4 +75,3 @@ log = $${:var}/log
    [publish-connection-parameter] [publish-connection-parameter]
    recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
    url = $${dream_platform_parameter:url} url = $${dream_platform_parameter:url}
    software/erp5/software.cfg
    View file @ c6cc45ab
    [buildout] [buildout]
    extends = extends =
    ../../stack/erp5/buildout.cfg ../../stack/erp5/buildout.cfg
    software/erp5testnode/testsuite/dummy/instance.cfg
    View file @ c6cc45ab
    ...@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2 ...@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2
    template = inline:#!/bin/sh template = inline:#!/bin/sh
    echo "Hello : $(date)" >> $${directory:log}/log.log echo "Hello : $(date)" >> $${directory:log}/log.log
    rendered = $${directory:script}/log-writer rendered = $${directory:script}/log-writer
    mode = 700 mode = 700
    \ No newline at end of file
    software/etherpad-lite/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd ...@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd
    [instance-etherpad-lite] [instance-etherpad-lite]
    _update_hash_filename_ = instance-etherpad-lite.cfg _update_hash_filename_ = instance-etherpad-lite.cfg
    md5sum = 28710a9a23320dd472387d81a698d12d md5sum = 7ead62829a85f5922bb9ed0fc8dfb0df
    [template-conf] [template-conf]
    _update_hash_filename_ = templates/settings.json.in _update_hash_filename_ = templates/settings.json.in
    ......
    software/etherpad-lite/development.cfg
    View file @ c6cc45ab
    ...@@ -29,4 +29,4 @@ stop-on-error = true ...@@ -29,4 +29,4 @@ stop-on-error = true
    update-command = ${:command} update-command = ${:command}
    command = command =
    grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
    grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
    \ No newline at end of file
    software/etherpad-lite/instance-etherpad-lite.cfg
    View file @ c6cc45ab
    ...@@ -75,4 +75,4 @@ recipe = slapos.cookbook:check_url_available ...@@ -75,4 +75,4 @@ recipe = slapos.cookbook:check_url_available
    path = $${basedirectory:promises}/frontend-etherpad path = $${basedirectory:promises}/frontend-etherpad
    url = $${request-frontend:connection-site_url} url = $${request-frontend:connection-site_url}
    dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
    curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
    \ No newline at end of file
    software/etherpad-lite/software.cfg
    View file @ c6cc45ab
    ...@@ -29,4 +29,4 @@ stop-on-error = true ...@@ -29,4 +29,4 @@ stop-on-error = true
    update-command = ${:command} update-command = ${:command}
    command = command =
    grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
    grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
    \ No newline at end of file
    software/gateone/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -4,12 +4,12 @@ md5sum = 428669a609aca3e0a7cae1387d332a75 ...@@ -4,12 +4,12 @@ md5sum = 428669a609aca3e0a7cae1387d332a75
    [template-gateone] [template-gateone]
    filename = instance-gateone.cfg.in filename = instance-gateone.cfg.in
    md5sum = e7096a17c36c3bd27a011de57b7abfc1 md5sum = 7c4cb83d6ccf5a5bcdb7b972123ac3e4
    [template-logrotate-base] [template-logrotate-base]
    _update_hash_filename_ = instance-logrotate-base.cfg.in _update_hash_filename_ = instance-logrotate-base.cfg.in
    md5sum = f28fbd310944f321ccb34b2a34c82005 md5sum = ebee34c726f30fff95a9e0ea167a635f
    [template-nginx-conf] [template-nginx-conf]
    _update_hash_filename_ = templates/nginx.conf.in _update_hash_filename_ = templates/nginx.conf.in
    md5sum = 3d80d73a9cfffca6687813d86ddc25ba md5sum = fe055886e255d9dea9f9f29008f6e780
    software/gateone/instance-gateone.cfg.in
    View file @ c6cc45ab
    ...@@ -154,4 +154,3 @@ develop-eggs-directory = {{ develop_eggs_directory }} ...@@ -154,4 +154,3 @@ develop-eggs-directory = {{ develop_eggs_directory }}
    offline = true offline = true
    [slap-parameter] [slap-parameter]
    software/gateone/instance-logrotate-base.cfg.in
    View file @ c6cc45ab
    ...@@ -47,4 +47,3 @@ backup = ${:srv}/backup ...@@ -47,4 +47,3 @@ backup = ${:srv}/backup
    etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
    services = ${:etc}/service services = ${:etc}/service
    log = ${buildout:directory}/var/log log = ${buildout:directory}/var/log
    software/gateone/templates/nginx.conf.in
    View file @ c6cc45ab
    ...@@ -48,4 +48,4 @@ http { ...@@ -48,4 +48,4 @@ http {
    proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
    } }
    } }
    } }
    \ No newline at end of file
    software/gitlab/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -30,7 +30,7 @@ md5sum = 61d1d04b9347b3168a1ad7676e4681ef ...@@ -30,7 +30,7 @@ md5sum = 61d1d04b9347b3168a1ad7676e4681ef
    [gitconfig.in] [gitconfig.in]
    _update_hash_filename_ = template/gitconfig.in _update_hash_filename_ = template/gitconfig.in
    md5sum = 7782f5c5d75663c2586e28d029c51e49 md5sum = eb1230fee50067924ba89f4dc6e82fa9
    [gitlab-parameters.cfg] [gitlab-parameters.cfg]
    _update_hash_filename_ = gitlab-parameters.cfg _update_hash_filename_ = gitlab-parameters.cfg
    ...@@ -50,11 +50,11 @@ md5sum = f4cc0bc898b8d59010d61473e2adc53b ...@@ -50,11 +50,11 @@ md5sum = f4cc0bc898b8d59010d61473e2adc53b
    [gitaly-config.toml.in] [gitaly-config.toml.in]
    _update_hash_filename_ = template/gitaly-config.toml.in _update_hash_filename_ = template/gitaly-config.toml.in
    md5sum = 056d7ed09e1bf20d022d3ef6b9363e00 md5sum = 0f1ec4077dab586cc003ae13f689eda2
    [instance-gitlab.cfg.in] [instance-gitlab.cfg.in]
    _update_hash_filename_ = instance-gitlab.cfg.in _update_hash_filename_ = instance-gitlab.cfg.in
    md5sum = 6effe68f7ef240780d1027dd834a562c md5sum = dfeff229aa696bb6b6051a2aff4301fe
    [instance-gitlab-export.cfg.in] [instance-gitlab-export.cfg.in]
    _update_hash_filename_ = instance-gitlab-export.cfg.in _update_hash_filename_ = instance-gitlab-export.cfg.in
    ...@@ -62,7 +62,7 @@ md5sum = 2af7dcf63f74e5edc53a3ff11fa4989b ...@@ -62,7 +62,7 @@ md5sum = 2af7dcf63f74e5edc53a3ff11fa4989b
    [instance-gitlab-test.cfg.in] [instance-gitlab-test.cfg.in]
    _update_hash_filename_ = instance-gitlab-test.cfg.in _update_hash_filename_ = instance-gitlab-test.cfg.in
    md5sum = 60714fb4e6c869c41bd5e9fada1b6e40 md5sum = 7ba08928e6a8998ec8ed1bb97851b726
    [macrolib.cfg.in] [macrolib.cfg.in]
    _update_hash_filename_ = macrolib.cfg.in _update_hash_filename_ = macrolib.cfg.in
    ...@@ -70,7 +70,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4 ...@@ -70,7 +70,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4
    [nginx-gitlab-http.conf.in] [nginx-gitlab-http.conf.in]
    _update_hash_filename_ = template/nginx-gitlab-http.conf.in _update_hash_filename_ = template/nginx-gitlab-http.conf.in
    md5sum = 79d2b4e8a32abf7a74a3d4528844c593 md5sum = cd7471a8c5d6f6bc848c62ce62dca966
    [nginx.conf.in] [nginx.conf.in]
    _update_hash_filename_ = template/nginx.conf.in _update_hash_filename_ = template/nginx.conf.in
    ...@@ -86,11 +86,11 @@ md5sum = 7c89a730889e3224548d9abe51a2d719 ...@@ -86,11 +86,11 @@ md5sum = 7c89a730889e3224548d9abe51a2d719
    [smtp_settings.rb.in] [smtp_settings.rb.in]
    _update_hash_filename_ = template/smtp_settings.rb.in _update_hash_filename_ = template/smtp_settings.rb.in
    md5sum = e2144b03f7247636143c65dc81550d75 md5sum = 4e1ced687a86e4cfff2dde91237e3942
    [template-gitlab-resiliency-restore.sh.in] [template-gitlab-resiliency-restore.sh.in]
    _update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in _update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in
    md5sum = 590fcadf26085fdd17487175bc0a469d md5sum = 16b9f52f00d55feab7e31a88029ad351
    [unicorn.rb.in] [unicorn.rb.in]
    _update_hash_filename_ = template/unicorn.rb.in _update_hash_filename_ = template/unicorn.rb.in
    ......
    software/gitlab/gowork.cfg
    View file @ c6cc45ab
    ...@@ -31,4 +31,4 @@ revision = 3f6c4deec8834bdcd2c28c7c5eeacd8211e759b5 ...@@ -31,4 +31,4 @@ revision = 3f6c4deec8834bdcd2c28c7c5eeacd8211e759b5
    <= go-git-package <= go-git-package
    go.importpath = lab.nexedi.com/kirr/go123 go.importpath = lab.nexedi.com/kirr/go123
    repository = https://lab.nexedi.com/kirr/go123.git repository = https://lab.nexedi.com/kirr/go123.git
    revision = 56bf8f815a revision = 56bf8f815a
    \ No newline at end of file
    software/gitlab/instance-gitlab-test.cfg.in
    View file @ c6cc45ab
    ...@@ -57,4 +57,3 @@ command = ...@@ -57,4 +57,3 @@ command =
    touch ${:backup-done} touch ${:backup-done}
    fi fi
    update-command = ${:command} update-command = ${:command}
    software/gitlab/instance-gitlab.cfg.in
    View file @ c6cc45ab
    ...@@ -839,4 +839,4 @@ command = ...@@ -839,4 +839,4 @@ command =
    # Promise, gitlab can connect to gitaly: # Promise, gitlab can connect to gitaly:
    # sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT] # sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT]
    \ No newline at end of file
    software/gitlab/template/gitaly-config.toml.in
    View file @ c6cc45ab
    ...@@ -49,4 +49,3 @@ dir = "{{ gitaly.location }}/ruby" ...@@ -49,4 +49,3 @@ dir = "{{ gitaly.location }}/ruby"
    [gitlab-shell] [gitlab-shell]
    # The directory where gitlab-shell is installed # The directory where gitlab-shell is installed
    dir = "{{ gitlab_shell_work.location }}" dir = "{{ gitlab_shell_work.location }}"
    software/gitlab/template/gitconfig.in
    View file @ c6cc45ab
    ...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
    [core] [core]
    autocrlf = input autocrlf = input
    [gc] [gc]
    auto = 0 auto = 0
    \ No newline at end of file
    software/gitlab/template/nginx-gitlab-http.conf.in
    View file @ c6cc45ab
    ...@@ -213,4 +213,3 @@ server { ...@@ -213,4 +213,3 @@ server {
    <%= @custom_gitlab_server_config %> <%= @custom_gitlab_server_config %>
    #} #}
    } }
    software/gitlab/template/smtp_settings.rb.in
    View file @ c6cc45ab
    ...@@ -29,4 +29,3 @@ end ...@@ -29,4 +29,3 @@ end
    # SMTP disabled in instance configuration (see `smtp_enable` parameter). # SMTP disabled in instance configuration (see `smtp_enable` parameter).
    # Mail sending, if enabled (see `email_enabled`), will be done via sendmail. # Mail sending, if enabled (see `email_enabled`), will be done via sendmail.
    {% endif %} {% endif %}
    software/gitlab/template/template-gitlab-resiliency-restore.sh.in
    View file @ c6cc45ab
    ...@@ -112,4 +112,4 @@ else ...@@ -112,4 +112,4 @@ else
    echo 'Backup restoration failed.' echo 'Backup restoration failed.'
    fi fi
    exit $RESTORE_EXIT_CODE exit $RESTORE_EXIT_CODE
    \ No newline at end of file
    software/grafana/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -19,7 +19,7 @@ md5sum = 13f4f3806522b265dd1912ff169d146d ...@@ -19,7 +19,7 @@ md5sum = 13f4f3806522b265dd1912ff169d146d
    [influxdb-config-file] [influxdb-config-file]
    filename = influxdb-config-file.cfg.in filename = influxdb-config-file.cfg.in
    md5sum = 7ce85159c0664b251e249eac4b37bea4 md5sum = a28972ced3e0f4aa776e43a9c44717c0
    [telegraf-config-file] [telegraf-config-file]
    filename = telegraf-config-file.cfg.in filename = telegraf-config-file.cfg.in
    ......
    software/grafana/influxdb-config-file.cfg.in
    View file @ c6cc45ab
    ...@@ -131,4 +131,3 @@ bind-address = "[{{ influxdb['local-host'] }}]:{{ influxdb['rpc-port'] }}" ...@@ -131,4 +131,3 @@ bind-address = "[{{ influxdb['local-host'] }}]:{{ influxdb['rpc-port'] }}"
    enabled = true enabled = true
    query-stats-enabled = false query-stats-enabled = false
    run-interval = "1s" run-interval = "1s"
    software/html5as/software.cfg
    View file @ c6cc45ab
    ...@@ -74,4 +74,3 @@ rdiff-backup = 1.0.5+SlapOSPatched001 ...@@ -74,4 +74,3 @@ rdiff-backup = 1.0.5+SlapOSPatched001
    slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
    smmap = 0.8.2 smmap = 0.8.2
    plone.recipe.command = 1.1 plone.recipe.command = 1.1
    software/html5ide/template/wrapper.in
    View file @ c6cc45ab
    #!${dash-output:dash} #!${dash-output:dash}
    {{ content }} {{ content }}
    \ No newline at end of file
    software/htmlvalidatorserver/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -22,7 +22,7 @@ md5sum = 09803fb71404edbccb32c44a0040dae4 ...@@ -22,7 +22,7 @@ md5sum = 09803fb71404edbccb32c44a0040dae4
    [template-validator] [template-validator]
    filename = instance-validator.cfg.in filename = instance-validator.cfg.in
    md5sum = f2609d1f526ba6349b1374e3631a9f7c md5sum = 2be286e367e37ce9e504170cd3a08007
    [template] [template]
    filename = instance.cfg.in filename = instance.cfg.in
    ......
    software/htmlvalidatorserver/instance-validator.cfg.in
    View file @ c6cc45ab
    ...@@ -83,4 +83,4 @@ parts = ...@@ -83,4 +83,4 @@ parts =
    eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
    develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
    offline = true offline = true
    \ No newline at end of file
    software/jstestnode/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
    [instance] [instance]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = cd8648ca8a4a098e1a6faf7246f0d395 md5sum = 342fcf3fc18e33fa4f940518dab6af5c
    [template-nginx-service] [template-nginx-service]
    filename = template-nginx-service.sh.in filename = template-nginx-service.sh.in
    md5sum = 529532e1240a66bdf39e3cbbef90ba87 md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
    [template-nginx-configuration] [template-nginx-configuration]
    filename = template-nginx.cfg.in filename = template-nginx.cfg.in
    ......
    software/jstestnode/instance.cfg.in
    View file @ c6cc45ab
    ...@@ -131,4 +131,4 @@ configuration._ = {} ...@@ -131,4 +131,4 @@ configuration._ = {}
    recipe = recipe =
    depends = depends =
    $${nginx-listen-promise:recipe} $${nginx-listen-promise:recipe}
    $${xvfb-promise:recipe} $${xvfb-promise:recipe}
    \ No newline at end of file
    software/jstestnode/software.cfg
    View file @ c6cc45ab
    ...@@ -121,4 +121,4 @@ output = ${buildout:directory}/runTestSuite.in ...@@ -121,4 +121,4 @@ output = ${buildout:directory}/runTestSuite.in
    slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
    selenium = 3.14.1 selenium = 3.14.1
    urllib3 = 1.24 urllib3 = 1.24
    certifi = 2018.10.15 certifi = 2018.10.15
    \ No newline at end of file
    software/jstestnode/template-nginx-service.sh.in
    View file @ c6cc45ab
    ...@@ -15,4 +15,4 @@ then ...@@ -15,4 +15,4 @@ then
    fi fi
    exec ${nginx-output:nginx} \ exec ${nginx-output:nginx} \
    -c $${nginx-configuration:output} -c $${nginx-configuration:output}
    \ No newline at end of file
    software/jupyter/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
    [instance-jupyter-notebook] [instance-jupyter-notebook]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = ba4e4c582b81deeb7339a13c82bbf34b md5sum = 1d5fe6cc4e48672ae7be1c223794a932
    [jupyter-notebook-config] [jupyter-notebook-config]
    filename = jupyter_notebook_config.py.jinja filename = jupyter_notebook_config.py.jinja
    ......
    software/jupyter/instance.cfg.in
    View file @ c6cc45ab
    ...@@ -149,4 +149,3 @@ context = ...@@ -149,4 +149,3 @@ context =
    recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
    target-directory = ${directory:jupyter_custom_dir} target-directory = ${directory:jupyter_custom_dir}
    link-binary = {{ custom_js_location }}/custom.js link-binary = {{ custom_js_location }}/custom.js
    software/kvm/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -51,7 +51,7 @@ md5sum = 6ea26f88252bf899c966d0f5675e7176 ...@@ -51,7 +51,7 @@ md5sum = 6ea26f88252bf899c966d0f5675e7176
    [template-ansible-promise] [template-ansible-promise]
    filename = template/ansible-promise.in filename = template/ansible-promise.in
    md5sum = 2036bf145f472f62ef8dee5e729328fd md5sum = b7e87479a289f472b634a046b44b5257
    [template-kvm-run] [template-kvm-run]
    filename = template/template-kvm-run.in filename = template/template-kvm-run.in
    ...@@ -63,15 +63,15 @@ md5sum = 3827b4f7624de190cf5f5d37e3b72e86 ...@@ -63,15 +63,15 @@ md5sum = 3827b4f7624de190cf5f5d37e3b72e86
    [template-apache-conf] [template-apache-conf]
    filename = template/apache.conf.in filename = template/apache.conf.in
    md5sum = ac97f6a52e1c5a19a646242ef85abb8a md5sum = e818aa16b3c736a0c2de3ec981663534
    [template-content] [template-content]
    filename = template/template-content.in filename = template/template-content.in
    md5sum = 822737e483864bf255ad1259237bef2a md5sum = 752c91a4a6b72f5cf8226d6b940015f8
    [template-qemu-ready] [template-qemu-ready]
    filename = template/qemu-is-ready.in filename = template/qemu-is-ready.in
    md5sum = b304eec8e2cb71f10ea83cac22f6db12 md5sum = fb330a796fadb6cd5c85217f80a42af3
    [file-download-script] [file-download-script]
    filename = template/download_file.in filename = template/download_file.in
    ......
    software/kvm/software.cfg
    View file @ c6cc45ab
    ...@@ -199,4 +199,3 @@ pycurl = 7.43.0 ...@@ -199,4 +199,3 @@ pycurl = 7.43.0
    slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
    smmap = 0.9.0 smmap = 0.9.0
    numpy = 1.16.4 numpy = 1.16.4
    software/kvm/template/ansible-promise.in
    View file @ c6cc45ab
    ...@@ -56,4 +56,4 @@ if __name__ == "__main__": ...@@ -56,4 +56,4 @@ if __name__ == "__main__":
    result = check_result() result = check_result()
    if not result[0]: if not result[0]:
    raise Exception('Failed to run Ansible in %s, result is: \n%s' % (vm_name, raise Exception('Failed to run Ansible in %s, result is: \n%s' % (vm_name,
    result[1])) result[1]))
    \ No newline at end of file
    software/kvm/template/apache.conf.in
    View file @ c6cc45ab
    ...@@ -60,4 +60,4 @@ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded ...@@ -60,4 +60,4 @@ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
    # Require all denied # Require all denied
    AllowOverride None AllowOverride None
    Require all granted Require all granted
    </Directory> </Directory>
    \ No newline at end of file
    software/kvm/template/qemu-is-ready.in
    View file @ c6cc45ab
    ...@@ -20,4 +20,4 @@ else ...@@ -20,4 +20,4 @@ else
    >&2 echo "$(tail $log_file)" >&2 echo "$(tail $log_file)"
    exit 1 exit 1
    fi fi
    fi fi
    \ No newline at end of file
    software/kvm/template/template-content.in
    View file @ c6cc45ab
    ...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
    {% for content in content_list.split(sep) -%} {% for content in content_list.split(sep) -%}
    {{ content }} {{ content }}
    {% endfor -%} {% endfor -%}
    {% endif -%} {% endif -%}
    \ No newline at end of file
    software/monitor/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -34,7 +34,7 @@ md5sum = c535f4df6388cdc3f6c1df2a91d6dd53 ...@@ -34,7 +34,7 @@ md5sum = c535f4df6388cdc3f6c1df2a91d6dd53
    [network-bench-cfg] [network-bench-cfg]
    filename = network_bench.cfg.in filename = network_bench.cfg.in
    md5sum = cfcbf2002b8eff5153e2bf68ed24b720 md5sum = 4f4d1a0afc225656278154e453587aea
    [monitor-collect-csv-dump] [monitor-collect-csv-dump]
    filename = script/collect_csv_dump.py filename = script/collect_csv_dump.py
    ......
    software/monitor/network_bench.cfg.in
    View file @ c6cc45ab
    ...@@ -14,4 +14,4 @@ ping = ...@@ -14,4 +14,4 @@ ping =
    {{ slapparameter_dict.get('ping_ip_list', '').split('\n') | join('\n ') }} {{ slapparameter_dict.get('ping_ip_list', '').split('\n') | join('\n ') }}
    ping6 = ping6 =
    {{ slapparameter_dict.get('ping6_ip_list', '').split('\n') | join('\n ') }} {{ slapparameter_dict.get('ping6_ip_list', '').split('\n') | join('\n ') }}
    \ No newline at end of file
    software/nextcloud/apache-httpd.conf.in
    View file @ c6cc45ab
    ...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
    ErrorLog "{{ parameter_dict['log-dir'] }}/nextcloud-error.log" ErrorLog "{{ parameter_dict['log-dir'] }}/nextcloud-error.log"
    CustomLog "{{ parameter_dict['log-dir'] }}/nextcloud-access.log" combined CustomLog "{{ parameter_dict['log-dir'] }}/nextcloud-access.log" combined
    </VirtualHost> </VirtualHost>
    \ No newline at end of file
    software/nextcloud/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,16 +14,16 @@ ...@@ -14,16 +14,16 @@
    # not need these here). # not need these here).
    [template-nextcloud-install.sh] [template-nextcloud-install.sh]
    filename = nextcloud-install.sh.in filename = nextcloud-install.sh.in
    md5sum = a2281f86f6a26a8ff40a57a495505977 md5sum = 209abce3f82706fb80995f7efea70a9c
    [template-apache-httpd] [template-apache-httpd]
    filename = apache-httpd.conf.in filename = apache-httpd.conf.in
    md5sum = 839258624e273aac71a96516bf34c7e6 md5sum = f7e8f6ea20f8685bb4e42cacaee4116f
    [template-nextcloud-config.json] [template-nextcloud-config.json]
    filename = nextcloud-config.json.in filename = nextcloud-config.json.in
    md5sum = fbc5eacda192cb02c8d9861cb628fe6f md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
    [template-nextcloud-instance] [template-nextcloud-instance]
    filename = nextcloud-instance.cfg.in filename = nextcloud-instance.cfg.in
    md5sum = 28f9a64176e86360a3398742d5ad8470 md5sum = b62f438d380363387fe225fa3d7e2291
    software/nextcloud/nextcloud-config.json.in
    View file @ c6cc45ab
    ...@@ -37,4 +37,4 @@ ...@@ -37,4 +37,4 @@
    "logfile": "{{ parameter_dict['data-dir'] }}/nextcloud.log", "logfile": "{{ parameter_dict['data-dir'] }}/nextcloud.log",
    "datadirectory": "{{ parameter_dict['data-dir'] }}" "datadirectory": "{{ parameter_dict['data-dir'] }}"
    } }
    } }
    \ No newline at end of file
    software/nextcloud/nextcloud-install.sh.in
    View file @ c6cc45ab
    ...@@ -139,4 +139,4 @@ sed -i 's#useCronUpdates\s*=.*#useCronUpdates = false#g' {{ parameter_dict['data ...@@ -139,4 +139,4 @@ sed -i 's#useCronUpdates\s*=.*#useCronUpdates = false#g' {{ parameter_dict['data
    if [ -f "{{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL" ]; then if [ -f "{{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL" ]; then
    rm {{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL rm {{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL
    fi fi
    \ No newline at end of file
    software/nextcloud/nextcloud-instance.cfg.in
    View file @ c6cc45ab
    ...@@ -222,4 +222,4 @@ instance.cli-url = ${apache-php-configuration:url} ...@@ -222,4 +222,4 @@ instance.cli-url = ${apache-php-configuration:url}
    instance.trusted-domain-1 = instance.trusted-domain-1 =
    instance.trusted-domain-2 = instance.trusted-domain-2 =
    instance.trusted-domain-3 = instance.trusted-domain-3 =
    instance.trusted-proxy-list = instance.trusted-proxy-list =
    \ No newline at end of file
    software/nextcloud/test/README.md
    View file @ c6cc45ab
    Tests for Nextcloud Software Release Tests for Nextcloud Software Release
    \ No newline at end of file
    software/packer/software.cfg
    View file @ c6cc45ab
    ...@@ -6,4 +6,4 @@ extends = ...@@ -6,4 +6,4 @@ extends =
    ../../component/packer/buildout.cfg ../../component/packer/buildout.cfg
    parts += parts +=
    qemu qemu
    \ No newline at end of file
    software/postgres/instance.cfg.in
    View file @ c6cc45ab
    ...@@ -88,4 +88,3 @@ partition = $${slap-connection:partition-id} ...@@ -88,4 +88,3 @@ partition = $${slap-connection:partition-id}
    url = $${slap-connection:server-url} url = $${slap-connection:server-url}
    key = $${slap-connection:key-file} key = $${slap-connection:key-file}
    cert = $${slap-connection:cert-file} cert = $${slap-connection:cert-file}
    software/proftpd/README.md
    View file @ c6cc45ab
    ...@@ -16,5 +16,3 @@ http://www.proftpd.org/docs/ ...@@ -16,5 +16,3 @@ http://www.proftpd.org/docs/
    * make sure SFTPLog is useful (seems very verbose and does not contain more than stdout) * make sure SFTPLog is useful (seems very verbose and does not contain more than stdout)
    * make it easier to manage users ( using `mod_auth_web` against an ERP5 endpoint or accepting a list of user/password as instance parameter ) * make it easier to manage users ( using `mod_auth_web` against an ERP5 endpoint or accepting a list of user/password as instance parameter )
    * allow configuring webhooks when new file is uploaded * allow configuring webhooks when new file is uploaded
    software/pureftpd/README.md
    View file @ c6cc45ab
    ...@@ -5,4 +5,3 @@ https://www.pureftpd.org/project/pure-ftpd ...@@ -5,4 +5,3 @@ https://www.pureftpd.org/project/pure-ftpd
    # Features # Features
    * After each upload, call the script /opt/pureftpd/upload_script * After each upload, call the script /opt/pureftpd/upload_script
    software/re6stnet/apache.conf.in
    View file @ c6cc45ab
    ...@@ -56,4 +56,4 @@ Listen {{ ipv6 }}:{{ apache_port }} ...@@ -56,4 +56,4 @@ Listen {{ ipv6 }}:{{ apache_port }}
    {% endif -%} {% endif -%}
    ProxyPass / http://{{ re6st_ipv4 }}:{{ re6st_port }}/ ProxyPass / http://{{ re6st_ipv4 }}:{{ re6st_port }}/
    </VirtualHost> </VirtualHost>
    \ No newline at end of file
    software/re6stnet/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -18,11 +18,11 @@ md5sum = 610fc6fd0444d3bab3fca4478572749a ...@@ -18,11 +18,11 @@ md5sum = 610fc6fd0444d3bab3fca4478572749a
    [template-re6stnet] [template-re6stnet]
    filename = instance-re6stnet.cfg.in filename = instance-re6stnet.cfg.in
    md5sum = ee582dbab92c1c452874ddca3831aef6 md5sum = 002f7405f565c82219b0d4b92790ff8c
    [template-apache-conf] [template-apache-conf]
    filename = apache.conf.in filename = apache.conf.in
    md5sum = d64cafda1139b740a49a9f5e30a1b57b md5sum = 2ed3c4e9b9d58d2e57cda227bdd454d2
    [template-re6st-registry-conf] [template-re6st-registry-conf]
    filename = re6st-registry.conf.in filename = re6st-registry.conf.in
    ...@@ -30,7 +30,7 @@ md5sum = b0f0facfea82a4481f4fb5b0b263e09a ...@@ -30,7 +30,7 @@ md5sum = b0f0facfea82a4481f4fb5b0b263e09a
    [template-wrapper] [template-wrapper]
    filename = wrapper.in filename = wrapper.in
    md5sum = 69e63cb58267335e21da772bd867657e md5sum = 7633bdfc0e638ff9979f963fbbca8f13
    [template-registry-run] [template-registry-run]
    filename = registry-run.in filename = registry-run.in
    ......
    software/re6stnet/instance-re6stnet.cfg.in
    View file @ c6cc45ab
    ...@@ -253,4 +253,3 @@ offline = true ...@@ -253,4 +253,3 @@ offline = true
    [slap-parameter] [slap-parameter]
    slave_instance_list = {} slave_instance_list = {}
    software/re6stnet/software.cfg
    View file @ c6cc45ab
    ...@@ -77,4 +77,3 @@ slapos.recipe.template = 4.4 ...@@ -77,4 +77,3 @@ slapos.recipe.template = 4.4
    # Required by: # Required by:
    # re6stnet==0.533 # re6stnet==0.533
    miniupnpc = 1.9 miniupnpc = 1.9
    software/re6stnet/wrapper.in
    View file @ c6cc45ab
    #!{{ dash }} #!{{ dash }}
    {{ content }} {{ content }}
    \ No newline at end of file
    software/redis-server/buildout.hash.cfg
    View file @ c6cc45ab
    [template] [template]
    _update_hash_filename_ = instance.cfg _update_hash_filename_ = instance.cfg
    md5sum = 5d2008c96a569c3ce498ddc0933afea3 md5sum = 651973f038d8b0f8c62e11e299344506
    [template-redis] [template-redis]
    _update_hash_filename_ = instance-redis.cfg _update_hash_filename_ = instance-redis.cfg
    md5sum = f7b01ca7698c1b771f0653d64dc945a7 md5sum = 1ed6238490b36eaae783d53d7a96cfea
    software/redis-server/instance-redis.cfg
    View file @ c6cc45ab
    ...@@ -53,4 +53,4 @@ redis_passwd = $${redis:passwd} ...@@ -53,4 +53,4 @@ redis_passwd = $${redis:passwd}
    redis_uses_password = $${redis:use_passwd} redis_uses_password = $${redis:use_passwd}
    [slap-parameter] [slap-parameter]
    use_passwd = false use_passwd = false
    \ No newline at end of file
    software/redis-server/instance.cfg
    View file @ c6cc45ab
    ...@@ -10,4 +10,4 @@ parts = ...@@ -10,4 +10,4 @@ parts =
    [switch-softwaretype] [switch-softwaretype]
    recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
    default = ${template-redis:output} default = ${template-redis:output}
    \ No newline at end of file
    software/repman/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
    # not need these here). # not need these here).
    [instance.cfg] [instance.cfg]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = b41f521b5f7980c64260ed0e5c494450 md5sum = 027cdcfe251b7bba9b779fee890a9162
    [instance-repman.cfg] [instance-repman.cfg]
    _update_hash_filename_ = instance-repman.cfg.jinja2.in _update_hash_filename_ = instance-repman.cfg.jinja2.in
    ...@@ -22,11 +22,11 @@ md5sum = 657ecdb1dfbbcf53e4e7932b3b5708c4 ...@@ -22,11 +22,11 @@ md5sum = 657ecdb1dfbbcf53e4e7932b3b5708c4
    [config-toml.in] [config-toml.in]
    _update_hash_filename_ = templates/config.toml.in _update_hash_filename_ = templates/config.toml.in
    md5sum = 19fe38a342a5c9857e29f78eedb3c46e md5sum = 2ee2c4bc5f985c11c2167b819d261256
    [config-cluster-toml.in] [config-cluster-toml.in]
    _update_hash_filename_ = templates/cluster-config.toml.in _update_hash_filename_ = templates/cluster-config.toml.in
    md5sum = 079599a2841b5a0d5178bb12c4a30ae8 md5sum = c78c6be9537d3dffbb526b0e819bacb5
    [nginx.conf.in] [nginx.conf.in]
    _update_hash_filename_ = templates/nginx.conf.in _update_hash_filename_ = templates/nginx.conf.in
    ...@@ -42,19 +42,19 @@ md5sum = f3661b788099bb31d71ba6e7d36836d9 ...@@ -42,19 +42,19 @@ md5sum = f3661b788099bb31d71ba6e7d36836d9
    [template-mariadb-initial-setup] [template-mariadb-initial-setup]
    _update_hash_filename_ = templates/mariadb_initial_setup.sql.in _update_hash_filename_ = templates/mariadb_initial_setup.sql.in
    md5sum = 9be53e2e92333b93e92556b8a01d9c42 md5sum = df44c2d6fb1971df582345daedad280c
    [mariadb-init-root-sql] [mariadb-init-root-sql]
    _update_hash_filename_ = templates/mariadb_init_root.sql.in _update_hash_filename_ = templates/mariadb_init_root.sql.in
    md5sum = d927b5d36410bb02717d5ca125525785 md5sum = d8a0a7d72b02f911dafda655941b805d
    [init-root-wrapper-in] [init-root-wrapper-in]
    _update_hash_filename_ = templates/init_root_wrapper.in _update_hash_filename_ = templates/init_root_wrapper.in
    md5sum = 83ef59b5afaf4454d368823c33aef9cb md5sum = 7661e3b2f66982b9b17bd2ab73e2e8ef
    [repman-manager-sh.in] [repman-manager-sh.in]
    _update_hash_filename_ = templates/repman-manager.sh.in _update_hash_filename_ = templates/repman-manager.sh.in
    md5sum = 50503bec392e31126328f51eadc11634 md5sum = 852dfab6d798aa1382eec4de2fd624f9
    [dbjobs-in] [dbjobs-in]
    _update_hash_filename_ = templates/dbjobs.in _update_hash_filename_ = templates/dbjobs.in
    ......
    software/repman/instance-repman-input-schema.json
    View file @ c6cc45ab
    ...@@ -397,4 +397,4 @@ ...@@ -397,4 +397,4 @@
    "type": "object" "type": "object"
    } }
    } }
    } }
    \ No newline at end of file
    software/repman/instance.cfg.in
    View file @ c6cc45ab
    ...@@ -101,5 +101,3 @@ template = {{ template_mariadb }} ...@@ -101,5 +101,3 @@ template = {{ template_mariadb }}
    filename = instance-mariadb.cfg filename = instance-mariadb.cfg
    extra-context = extra-context =
    section parameter_dict template-mariadb-parameters section parameter_dict template-mariadb-parameters
    software/repman/templates/cluster-config.toml.in
    View file @ c6cc45ab
    ...@@ -66,5 +66,3 @@ switchover-slave-wait-catch = {{ setbool(parameter_dict['switchover-slave-wait-c ...@@ -66,5 +66,3 @@ switchover-slave-wait-catch = {{ setbool(parameter_dict['switchover-slave-wait-c
    switchover-wait-kill = {{ parameter_dict['switchover-wait-kill'] }} switchover-wait-kill = {{ parameter_dict['switchover-wait-kill'] }}
    switchover-wait-trx = {{ parameter_dict['switchover-wait-trx'] }} switchover-wait-trx = {{ parameter_dict['switchover-wait-trx'] }}
    switchover-wait-write-query = {{ parameter_dict['switchover-wait-write-query'] }} switchover-wait-write-query = {{ parameter_dict['switchover-wait-write-query'] }}
    software/repman/templates/config.toml.in
    View file @ c6cc45ab
    ...@@ -67,4 +67,3 @@ sysbench-threads = 4 ...@@ -67,4 +67,3 @@ sysbench-threads = 4
    # Time to run benchmark (default 100) # Time to run benchmark (default 100)
    sysbench-time = 100 sysbench-time = 100
    sysbench-v1 = true sysbench-v1 = true
    software/repman/templates/init_root_wrapper.in
    View file @ c6cc45ab
    ...@@ -29,4 +29,4 @@ if [ ! -f "{{ upgrade_done }}" ]; then ...@@ -29,4 +29,4 @@ if [ ! -f "{{ upgrade_done }}" ]; then
    if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
    touch {{ upgrade_done }}; touch {{ upgrade_done }};
    fi fi
    fi fi
    \ No newline at end of file
    software/repman/templates/mariadb_init_root.sql.in
    View file @ c6cc45ab
    ...@@ -15,4 +15,4 @@ CREATE USER '{{ parameter_dict["heartbeat-user"] }}'@'%' IDENTIFIED BY '{{ param ...@@ -15,4 +15,4 @@ CREATE USER '{{ parameter_dict["heartbeat-user"] }}'@'%' IDENTIFIED BY '{{ param
    GRANT ALL ON *.* TO '{{ parameter_dict["heartbeat-user"] }}'@'%' WITH GRANT OPTION ; GRANT ALL ON *.* TO '{{ parameter_dict["heartbeat-user"] }}'@'%' WITH GRANT OPTION ;
    DROP DATABASE IF EXISTS test ; DROP DATABASE IF EXISTS test ;
    FLUSH PRIVILEGES ; FLUSH PRIVILEGES ;
    \ No newline at end of file
    software/repman/templates/mariadb_initial_setup.sql.in
    View file @ c6cc45ab
    ...@@ -19,4 +19,4 @@ GRANT ALL PRIVILEGES ON `{{ name }}`.* TO `{{ user }}`@'::' IDENTIFIED BY '{{ pa ...@@ -19,4 +19,4 @@ GRANT ALL PRIVILEGES ON `{{ name }}`.* TO `{{ user }}`@'::' IDENTIFIED BY '{{ pa
    {% for entry in parameter_dict['database-list'] -%} {% for entry in parameter_dict['database-list'] -%}
    {{ database(entry['name'], entry.get('user'), entry.get('password')) }} {{ database(entry['name'], entry.get('user'), entry.get('password')) }}
    {% endfor -%} {% endfor -%}
    \ No newline at end of file
    software/repman/templates/repman-manager.sh.in
    View file @ c6cc45ab
    ...@@ -79,4 +79,4 @@ if [ ! -f "{{ parameter_dict['bootstrap'] }}/{{ name }}_bootstrapped" ]; then ...@@ -79,4 +79,4 @@ if [ ! -f "{{ parameter_dict['bootstrap'] }}/{{ name }}_bootstrapped" ]; then
    fi fi
    fi fi
    {% endfor %} {% endfor %}
    \ No newline at end of file
    software/seleniumrunner/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
    [template] [template]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = 1f31a063c79e19243dcc5508e08a6ae5 md5sum = 683fdb547b0c42460361786e1ab102ca
    software/seleniumrunner/instance.cfg.in
    View file @ c6cc45ab
    ...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
    eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
    develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
    offline = true offline = true
    software/seleniumserver/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88 ...@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
    [template-selenium] [template-selenium]
    filename = instance-selenium.cfg.in filename = instance-selenium.cfg.in
    md5sum = 269ac5ce96695ede3ee917c6ce17ae2d md5sum = 597991d7354970550d25324e3836adda
    software/seleniumserver/instance-selenium.cfg.in
    View file @ c6cc45ab
    ...@@ -347,4 +347,4 @@ fonts = $${:srv}/fonts/ ...@@ -347,4 +347,4 @@ fonts = $${:srv}/fonts/
    fontconfig-cache = $${buildout:directory}/.fontconfig fontconfig-cache = $${buildout:directory}/.fontconfig
    ssh = $${:etc}/ssh ssh = $${:etc}/ssh
    run = $${:var}/run run = $${:var}/run
    \ No newline at end of file
    software/slapos-in-partition/template/httpd.conf.in
    View file @ c6cc45ab
    ...@@ -47,4 +47,3 @@ LoadModule autoindex_module modules/mod_autoindex.so ...@@ -47,4 +47,3 @@ LoadModule autoindex_module modules/mod_autoindex.so
    order allow,deny order allow,deny
    Allow from All Allow from All
    </Directory> </Directory>
    software/slapos-in-partition/template/slapos.cfg.in
    View file @ c6cc45ab
    ...@@ -20,4 +20,3 @@ input_definition_file = ${:computer-definition-file} ...@@ -20,4 +20,3 @@ input_definition_file = ${:computer-definition-file}
    computer_xml = ${:computer-xml} computer_xml = ${:computer-xml}
    partition_amount = ${:partition-amount} partition_amount = ${:partition-amount}
    create_tap = false create_tap = false
    software/slapos-master/apache-backend.conf.in
    View file @ c6cc45ab
    ...@@ -198,4 +198,4 @@ Listen {{ ip }}:{{ port }} ...@@ -198,4 +198,4 @@ Listen {{ ip }}:{{ port }}
    RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P] RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P]
    {% endfor -%} {% endfor -%}
    </VirtualHost> </VirtualHost>
    {% endfor -%} {% endfor -%}
    \ No newline at end of file
    software/slapos-master/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -22,4 +22,4 @@ md5sum = d10a5ddfffa67b8ca01b3e38315bae2f ...@@ -22,4 +22,4 @@ md5sum = d10a5ddfffa67b8ca01b3e38315bae2f
    [template-apache-backend-conf] [template-apache-backend-conf]
    filename = apache-backend.conf.in filename = apache-backend.conf.in
    md5sum = a169c1d6b0f2636f21f180e8a0b52137 md5sum = ba8f878083b79535c6a2d10de496d90f
    software/slapos-testing/software-py3.cfg
    View file @ c6cc45ab
    ...@@ -4,4 +4,3 @@ extends = ...@@ -4,4 +4,3 @@ extends =
    [python] [python]
    part = python3 part = python3
    software/slaprunner/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -42,7 +42,7 @@ md5sum = 2b06f7eb9a1d45d250d4b92a944db925 ...@@ -42,7 +42,7 @@ md5sum = 2b06f7eb9a1d45d250d4b92a944db925
    [template_httpd_conf] [template_httpd_conf]
    filename = httpd_conf.in filename = httpd_conf.in
    md5sum = 1d96c29b931383b2a87b9ae049d07d74 md5sum = 1d983937ad0909b3ef4d35d190645635
    [template_launcher] [template_launcher]
    filename = launcher.in filename = launcher.in
    ...@@ -54,15 +54,15 @@ md5sum = fa90fc9a9010ce4bb1478ae37da9c56d ...@@ -54,15 +54,15 @@ md5sum = fa90fc9a9010ce4bb1478ae37da9c56d
    [template-slapformat-definition.cfg] [template-slapformat-definition.cfg]
    filename = template/slapformat-definition.cfg.in filename = template/slapformat-definition.cfg.in
    md5sum = a94299dd2133956060486609e30b97ec md5sum = bbb767dee9730f5a816ce4341403d89b
    [template-parameters] [template-parameters]
    filename = parameters.xml.in filename = parameters.xml.in
    md5sum = f8446fcf254b4929eb828a9a1d7e5f62 md5sum = 0d7b2432aa809b859509ca1114accd8f
    [template-bash-profile] [template-bash-profile]
    filename = template/bash_profile.in filename = template/bash_profile.in
    md5sum = 7645048216fcf957f7773534cd0408dc md5sum = d0ff3c86c76168d17d27b47b93a9b7aa
    [template-supervisord] [template-supervisord]
    filename = template/supervisord.conf.in filename = template/supervisord.conf.in
    ...@@ -78,7 +78,7 @@ md5sum = acaac32cf1bd45714272468a89f4f119 ...@@ -78,7 +78,7 @@ md5sum = acaac32cf1bd45714272468a89f4f119
    [template-resilient-software-release-information] [template-resilient-software-release-information]
    filename = template/resilient_software_release_information.py.in filename = template/resilient_software_release_information.py.in
    md5sum = 2451072826a9ad9425d62c9e9c7f6284 md5sum = 869a3afbf3c2fff6c72602662c6a8730
    [template-slapuser-script] [template-slapuser-script]
    filename = template/slapos-slapuser-script.in filename = template/slapos-slapuser-script.in
    ......
    software/slaprunner/httpd_conf.in
    View file @ c6cc45ab
    ...@@ -95,4 +95,3 @@ Alias /share {{ parameters.runner_home }} ...@@ -95,4 +95,3 @@ Alias /share {{ parameters.runner_home }}
    Require valid-user Require valid-user
    </LimitExcept> </LimitExcept>
    </Directory> </Directory>
    software/slaprunner/parameters.xml.in
    View file @ c6cc45ab
    ...@@ -15,4 +15,3 @@ ...@@ -15,4 +15,3 @@
    {% endfor %} {% endfor %}
    {% endif %} {% endif %}
    </instance> </instance>
    software/slaprunner/software.cfg
    View file @ c6cc45ab
    ...@@ -180,4 +180,3 @@ slapos.recipe.template = 4.4 ...@@ -180,4 +180,3 @@ slapos.recipe.template = 4.4
    collective.recipe.environment = 0.2.0 collective.recipe.environment = 0.2.0
    smmap = 0.9.0 smmap = 0.9.0
    lockfile = 0.12.2 lockfile = 0.12.2
    software/slaprunner/template/bash_profile.in
    View file @ c6cc45ab
    ...@@ -36,4 +36,3 @@ alias l='ls -CF' ...@@ -36,4 +36,3 @@ alias l='ls -CF'
    echo "Welcome to SlapOS slaprunner shell" echo "Welcome to SlapOS slaprunner shell"
    echo echo
    software/slaprunner/template/resilient_software_release_information.py.in
    View file @ c6cc45ab
    ...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
    def main(): def main():
    return { return {
    'Read the log from the importer': '<a href="${:resilient-log-url}">${:resilient-log-url}</a>', 'Read the log from the importer': '<a href="${:resilient-log-url}">${:resilient-log-url}</a>',
    } }
    \ No newline at end of file
    software/slaprunner/template/slapformat-definition.cfg.in
    View file @ c6cc45ab
    ...@@ -10,4 +10,3 @@ pathname = slappart{{ partition_index }} ...@@ -10,4 +10,3 @@ pathname = slappart{{ partition_index }}
    network_interface = network_interface =
    {% endfor %} {% endfor %}
    software/test-slave-instance-deployment/instance-test.cfg
    View file @ c6cc45ab
    ...@@ -24,4 +24,4 @@ slave-instance-list = $${slap-configuration:slave-instance-list} ...@@ -24,4 +24,4 @@ slave-instance-list = $${slap-configuration:slave-instance-list}
    recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
    # XXX hardcoded # XXX hardcoded
    -slave-reference = slappart0_Test Root Instance - Slave -slave-reference = slappart0_Test Root Instance - Slave
    foo = I am slave instance, and I am deployed! foo = I am slave instance, and I am deployed!
    \ No newline at end of file
    software/turnserver/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -19,4 +19,4 @@ md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3 ...@@ -19,4 +19,4 @@ md5sum = d027a2dccaf15ae6e7d3a28cc02d70c3
    [template-turnserver] [template-turnserver]
    filename = instance-turnserver.cfg.jinja2.in filename = instance-turnserver.cfg.jinja2.in
    md5sum = 62382da42ea56e9fd0124caeca42bcf3 md5sum = 539417d669c15b853ac8525f8d5cbc44
    software/turnserver/instance-turnserver.cfg.jinja2.in
    View file @ c6cc45ab
    ...@@ -153,4 +153,4 @@ parts = ...@@ -153,4 +153,4 @@ parts =
    eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
    develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
    offline = true offline = true
    \ No newline at end of file
    software/turnserver/test/README.md
    View file @ c6cc45ab
    Tests for TurnServer Software Release Tests for TurnServer Software Release
    \ No newline at end of file
    software/wordpress/buildout.hash.cfg
    View file @ c6cc45ab
    [application-template] [application-template]
    _update_hash_filename_ = wp-config.php.in _update_hash_filename_ = wp-config.php.in
    md5sum = 0d62b28125ca3c780db0b547199953f2 md5sum = d53056c1b3c59525a58f41aea53622aa
    software/wordpress/development.cfg
    View file @ c6cc45ab
    ...@@ -50,4 +50,3 @@ command = ...@@ -50,4 +50,3 @@ command =
    grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
    grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
    grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
    software/wordpress/wp-config.php.in
    View file @ c6cc45ab
    ...@@ -89,4 +89,4 @@ if ( !defined('ABSPATH') ) ...@@ -89,4 +89,4 @@ if ( !defined('ABSPATH') )
    /** Sets up WordPress vars and included files. */ /** Sets up WordPress vars and included files. */
    require_once(ABSPATH . 'wp-settings.php'); require_once(ABSPATH . 'wp-settings.php');
    remove_action( 'template_redirect', 'redirect_canonical' ); remove_action( 'template_redirect', 'redirect_canonical' );
    \ No newline at end of file
    stack/erp5/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -74,7 +74,7 @@ md5sum = 328ea2bb5f2bff18f8be8c541c01f260 ...@@ -74,7 +74,7 @@ md5sum = 328ea2bb5f2bff18f8be8c541c01f260
    [monitor-template-dummy] [monitor-template-dummy]
    filename = dummy.cfg filename = dummy.cfg
    md5sum = d41d8cd98f00b204e9800998ecf8427e md5sum = 68b329da9893e34099c7d8ad5cb9c940
    [template-erp5] [template-erp5]
    filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
    ......
    stack/hadoop/buildout.hash.cfg
    View file @ c6cc45ab
    [instance-stack] [instance-stack]
    filename = instance-stack.cfg.in filename = instance-stack.cfg.in
    md5sum = 3c846dd1269aeef43cd2d5448463563b md5sum = 42da07374e980f1934e01589684f1811
    stack/hadoop/instance-stack.cfg.in
    View file @ c6cc45ab
    ...@@ -48,4 +48,3 @@ url = ${:_profile_base_location_}/template/start-daemons.sh.in ...@@ -48,4 +48,3 @@ url = ${:_profile_base_location_}/template/start-daemons.sh.in
    output = $${directories:bin}/start-daemons.sh output = $${directories:bin}/start-daemons.sh
    md5sum = 35a51a7f826d29e47c564c57e954db80 md5sum = 35a51a7f826d29e47c564c57e954db80
    mode = 0755 mode = 0755
    stack/lamp/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,15 +14,15 @@ ...@@ -14,15 +14,15 @@
    # not need these here). # not need these here).
    [instance] [instance]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = 6efa60dd898d3cd568afb4a47b94d573 md5sum = be63b936ed521edaead8e0770ac64621
    [instance-apache-php] [instance-apache-php]
    filename = instance-apache-php.cfg.in filename = instance-apache-php.cfg.in
    md5sum = 5212aed6c82876509eae9eda0975ffa1 md5sum = a20bb27c0077b5a7252bda06ba7e069d
    [instance-lamp] [instance-lamp]
    filename = instance-lamp.cfg.jinja2.in filename = instance-lamp.cfg.jinja2.in
    md5sum = 39e765fca5fcd92cb9fa13cd2b4d95fd md5sum = 52b76d3c8aa23f467db33e32a2b50ed6
    [template-apache.conf] [template-apache.conf]
    filename = apache.conf.in filename = apache.conf.in
    ...@@ -30,4 +30,4 @@ md5sum = 04080510698732d84122b464fdb08c6a ...@@ -30,4 +30,4 @@ md5sum = 04080510698732d84122b464fdb08c6a
    [template-php.ini] [template-php.ini]
    filename = php.ini.in filename = php.ini.in
    md5sum = 7de35e3f8619324119ff296580d2880f md5sum = 599358f7df4c1e0de86270f5992ef904
    stack/lamp/instance-apache-php.cfg.in
    View file @ c6cc45ab
    ...@@ -215,4 +215,4 @@ config-port = ${apache-php-configuration:port} ...@@ -215,4 +215,4 @@ config-port = ${apache-php-configuration:port}
    [slap-parameter] [slap-parameter]
    {% for key, value in slapparameter_dict.items() -%} {% for key, value in slapparameter_dict.items() -%}
    {{ key }} = {{ value }} {{ key }} = {{ value }}
    {% endfor -%} {% endfor -%}
    \ No newline at end of file
    stack/lamp/instance-lamp.cfg.jinja2.in
    View file @ c6cc45ab
    ...@@ -124,4 +124,4 @@ parts = ...@@ -124,4 +124,4 @@ parts =
    eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
    develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
    offline = true offline = true
    \ No newline at end of file
    stack/lamp/instance.cfg.in
    View file @ c6cc45ab
    ...@@ -104,4 +104,3 @@ extra-context = ...@@ -104,4 +104,3 @@ extra-context =
    key ipv6_set slap-configuration:ipv6 key ipv6_set slap-configuration:ipv6
    raw bin_directory {{ bin_directory }} raw bin_directory {{ bin_directory }}
    section parameter_dict dynamic-template-mariadb-parameters section parameter_dict dynamic-template-mariadb-parameters
    stack/lamp/php.ini.in
    View file @ c6cc45ab
    ...@@ -69,4 +69,3 @@ opcache.interned_strings_buffer=8 ...@@ -69,4 +69,3 @@ opcache.interned_strings_buffer=8
    opcache.max_accelerated_files=10000 opcache.max_accelerated_files=10000
    opcache.revalidate_freq=1 opcache.revalidate_freq=1
    opcache.save_comments=1 opcache.save_comments=1
    stack/logrotate/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
    # not need these here). # not need these here).
    [logrotate-conf-template] [logrotate-conf-template]
    filename = logrotate.conf.in filename = logrotate.conf.in
    md5sum = 2fc0ea335969ffab7d8c4f98e3d04ae7 md5sum = 7c41026716d856bba7c1252b72adbf77
    [logrotate-entry-template] [logrotate-entry-template]
    filename = logrotate_entry.in filename = logrotate_entry.in
    ......
    stack/logrotate/logrotate.conf.in
    View file @ c6cc45ab
    ...@@ -2,4 +2,3 @@ compresscmd {{ parameter_dict['compress-binary'] }} ...@@ -2,4 +2,3 @@ compresscmd {{ parameter_dict['compress-binary'] }}
    compressoptions -9 compressoptions -9
    uncompresscmd {{ parameter_dict['uncompress-binary'] }} uncompresscmd {{ parameter_dict['uncompress-binary'] }}
    include {{ parameter_dict['logrotate-entries'] }} include {{ parameter_dict['logrotate-entries'] }}
    stack/monitor/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -22,11 +22,11 @@ md5sum = 0540fc5cc439a06079e9e724a5a55a70 ...@@ -22,11 +22,11 @@ md5sum = 0540fc5cc439a06079e9e724a5a55a70
    [monitor-template-wrapper] [monitor-template-wrapper]
    _update_hash_filename_ = templates/wrapper.in _update_hash_filename_ = templates/wrapper.in
    md5sum = 1695c9a06a2b11ccfe893d7a224e489d md5sum = e8566c00b28f6f86adde11b6b6371403
    [monitor-conf] [monitor-conf]
    _update_hash_filename_ = templates/monitor.conf.in _update_hash_filename_ = templates/monitor.conf.in
    md5sum = 91c4c9bba1f7df788b9b7a059ed89ac2 md5sum = 76ec5b30a11e03bb2496776684259fdf
    [monitor-httpd-cors] [monitor-httpd-cors]
    _update_hash_filename_ = templates/httpd-cors.cfg.in _update_hash_filename_ = templates/httpd-cors.cfg.in
    ......
    stack/monitor/templates/monitor.conf.in
    View file @ c6cc45ab
    ...@@ -16,4 +16,4 @@ monitor-url-list = ...@@ -16,4 +16,4 @@ monitor-url-list =
    [promises] [promises]
    {% for key, value in promise_parameter_dict.items() -%} {% for key, value in promise_parameter_dict.items() -%}
    {{ key }} = {{ value.strip().replace("\n", "\n ") }} {{ key }} = {{ value.strip().replace("\n", "\n ") }}
    {% endfor -%} {% endfor -%}
    \ No newline at end of file
    stack/monitor/templates/wrapper.in
    View file @ c6cc45ab
    #!{{ dash_binary }} #!{{ dash_binary }}
    {{ content }} {{ content }}
    \ No newline at end of file
    stack/resilient/buildout.hash.cfg
    View file @ c6cc45ab
    ...@@ -30,7 +30,7 @@ md5sum = 382d9b57faac92da3c723760f2210c13 ...@@ -30,7 +30,7 @@ md5sum = 382d9b57faac92da3c723760f2210c13
    [template-replicated] [template-replicated]
    filename = template-replicated.cfg.in filename = template-replicated.cfg.in
    md5sum = 1b25afe215e45a92e0988ea2ca9484f4 md5sum = 0917aaacb752526e6f114839a3e6e1de
    [template-parts] [template-parts]
    filename = template-parts.cfg.in filename = template-parts.cfg.in
    ...@@ -38,11 +38,11 @@ md5sum = 071b1034ee8f5cc14f79b16fdeba2813 ...@@ -38,11 +38,11 @@ md5sum = 071b1034ee8f5cc14f79b16fdeba2813
    [template-resilient-templates] [template-resilient-templates]
    filename = template-resilient-templates.cfg.in filename = template-resilient-templates.cfg.in
    md5sum = 3b426db6fddce431b363d095a22dd698 md5sum = 604b9d160ab85ec80718a2c54df2c4b7
    [instance-frozen] [instance-frozen]
    filename = instance-frozen.cfg.in filename = instance-frozen.cfg.in
    md5sum = d21472f0e58f928fb827f2cbf22c4d4a md5sum = 2c9828b57a65ee1eda62fcc4e9a92714
    [resilient-web-takeover-cgi-script-download] [resilient-web-takeover-cgi-script-download]
    filename = resilient-web-takeover-cgi-script.py.in filename = resilient-web-takeover-cgi-script.py.in
    ...@@ -50,7 +50,7 @@ md5sum = 4137b7ac6b20a6cd897ad58f51a763b1 ...@@ -50,7 +50,7 @@ md5sum = 4137b7ac6b20a6cd897ad58f51a763b1
    [template-wrapper] [template-wrapper]
    filename = templates/wrapper.in filename = templates/wrapper.in
    md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
    [notifier-feed-promise-template] [notifier-feed-promise-template]
    filename = templates/notifier-feed-promise.py.in filename = templates/notifier-feed-promise.py.in
    ......
    stack/resilient/instance-frozen.cfg.in
    View file @ c6cc45ab
    ...@@ -3,4 +3,3 @@ eggs-directory = ${buildout:eggs-directory} ...@@ -3,4 +3,3 @@ eggs-directory = ${buildout:eggs-directory}
    develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
    offline = true offline = true
    parts = parts =
    stack/resilient/template-replicated.cfg.in
    View file @ c6cc45ab
    ...@@ -301,4 +301,3 @@ pbs-{{namebase}}{{id}}-computer-guid = ...@@ -301,4 +301,3 @@ pbs-{{namebase}}{{id}}-computer-guid =
    ignore-known-hosts-file = false ignore-known-hosts-file = false
    {% endmacro %} {% endmacro %}
    stack/resilient/template-resilient-templates.cfg.in
    View file @ c6cc45ab
    ...@@ -43,4 +43,3 @@ context = ...@@ -43,4 +43,3 @@ context =
    key slave_instance_list slap-configuration:slave-instance-list key slave_instance_list slap-configuration:slave-instance-list
    key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
    key ipv6 slap-configuration:ipv6-random key ipv6 slap-configuration:ipv6-random
    stack/resilient/templates/wrapper.in
    View file @ c6cc45ab
    #!${dash-output:dash} #!${dash-output:dash}
    {{ content }} {{ content }}
    \ No newline at end of file
    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