Commit 86deb9c6 authored by Kirill Smelkov's avatar Kirill Smelkov

*: slapos.git moved to https://lab.nexedi.com/nexedi/slapos.git

This updates links to slapos.git in the tree to point to new location.

We do so whole-tree except one place in stack/monitor/ :

    [download-monitor-static]
    recipe = hexagonit.recipe.download
    url = http://git.erp5.org/gitweb/slapos.git/snapshot/930be99041ea26b7b1186830e5eb56ef0acc1bdf.tar.gz
    ...

(see d8800c0b "monitor: Download statics files from snapshot")

The reason we do not update that link yet, is that 930be99041ea26b7b1186830e5eb56ef0acc1bdf
is a tree object and gitlab does not allow to dowload tree object as archives (yet ?)

So for now that link stays unconverted - and we'll think how to do with it.
parent a49deb04
...@@ -18,7 +18,7 @@ module = lamp.simple ...@@ -18,7 +18,7 @@ module = lamp.simple
you also need to extend lamp.cfg you also need to extend lamp.cfg
extends = extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.50:/stack/lamp.cfg https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.50/stack/lamp.cfg
lamp.runner lamp.runner
......
...@@ -370,7 +370,7 @@ curl_path = ${curl:location}/bin/curl ...@@ -370,7 +370,7 @@ curl_path = ${curl:location}/bin/curl
domain = domain =
domain2 = domain2 =
domain3 = domain3 =
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg frontend-software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
# Default value if no ssh parameter is specified # Default value if no ssh parameter is specified
logbox-ip = logbox-ip =
logbox-port = logbox-port =
......
...@@ -33,7 +33,7 @@ ex: ...@@ -33,7 +33,7 @@ ex:
<parameter id="-frontend-type">custom-personal</parameter> <parameter id="-frontend-type">custom-personal</parameter>
<parameter id="-frontend-2-state">stopped</parameter> <parameter id="-frontend-2-state">stopped</parameter>
<parameter id="-sla-3-computer_guid">COMP-1234</parameter> <parameter id="-sla-3-computer_guid">COMP-1234</parameter>
<parameter id="-frontend-software-release-url">http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.183:/software/apache-frontend/software.cfg</parameter> <parameter id="-frontend-software-release-url">https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.183/software/apache-frontend/software.cfg</parameter>
will request the third frontend on COMP-1234. All frontends will be of software type "custom-personal". The second frontend will be requested with the state stopped will request the third frontend on COMP-1234. All frontends will be of software type "custom-personal". The second frontend will be requested with the state stopped
Note: the way slaves are transformed to a parameter avoid modifying more than 3 lines in the frontend logic. Note: the way slaves are transformed to a parameter avoid modifying more than 3 lines in the frontend logic.
......
...@@ -20,7 +20,7 @@ develop = ...@@ -20,7 +20,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = frontend branch = frontend
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -72,7 +72,7 @@ stop-on-error = true ...@@ -72,7 +72,7 @@ stop-on-error = true
branch = grid-computing branch = grid-computing
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe] [check-recipe]
......
...@@ -151,7 +151,7 @@ stop-on-error = true ...@@ -151,7 +151,7 @@ stop-on-error = true
branch = grid-computing branch = grid-computing
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe] [check-recipe]
......
...@@ -14,7 +14,7 @@ develop = ...@@ -14,7 +14,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = davstorage-ajaxplorer branch = davstorage-ajaxplorer
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -164,7 +164,7 @@ tmp-php = $${rootdirectory:tmp}/php ...@@ -164,7 +164,7 @@ tmp-php = $${rootdirectory:tmp}/php
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
name = Frontend Ajax name = Frontend Ajax
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-https-only = true config-https-only = true
config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/ config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
...@@ -175,7 +175,7 @@ return = domain ...@@ -175,7 +175,7 @@ return = domain
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
name = Frontend Webdav name = Frontend Webdav
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-https-only = true config-https-only = true
config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/ config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
......
...@@ -14,7 +14,7 @@ develop = ...@@ -14,7 +14,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = davstorage-ajaxplorer branch = davstorage-ajaxplorer
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -3,7 +3,7 @@ recipe_location = ${:parts-directory}/slapos.cookbook ...@@ -3,7 +3,7 @@ recipe_location = ${:parts-directory}/slapos.cookbook
develop = ${:recipe_location} develop = ${:recipe_location}
extends = extends =
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5scalabilitytestbed:/component/lxml-python/buildout.cfg https://lab.nexedi.com/nexedi/slapos/raw/erp5scalabilitytestbed/component/lxml-python/buildout.cfg
find-links = find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
...@@ -27,7 +27,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link ...@@ -27,7 +27,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = git clone -b erp5scalabilitytestbed --quiet http://git.erp5.org/repos/slapos.git "${:location}" command = git clone -b erp5scalabilitytestbed --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}"
update-command = cd "${:location}" && git fetch --quiet && git reset --hard @{upstream} update-command = cd "${:location}" && git fetch --quiet && git reset --hard @{upstream}
[eggs] [eggs]
......
...@@ -160,4 +160,4 @@ ca-dir = $${rootdirectory:srv}/ca ...@@ -160,4 +160,4 @@ ca-dir = $${rootdirectory:srv}/ca
node-quantity = 1 node-quantity = 1
test-suite-master-url = test-suite-master-url =
instance-dict = instance-dict =
software-path-list = ["http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/master:/software/seleniumrunner/software.cfg"] software-path-list = ["https://lab.nexedi.com/nexedi/slapos/raw/master/software/seleniumrunner/software.cfg"]
...@@ -13,7 +13,7 @@ develop = ...@@ -13,7 +13,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = etherpad-lite branch = etherpad-lite
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -65,7 +65,7 @@ command-line = $${etherpad-run-script:output} -s $${etherpad-run-script:etherpad ...@@ -65,7 +65,7 @@ command-line = $${etherpad-run-script:output} -s $${etherpad-run-script:etherpad
recipe = slapos.cookbook:request recipe = slapos.cookbook:request
name = Frontend name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port} config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port}
return = site_url return = site_url
......
...@@ -13,7 +13,7 @@ develop = ...@@ -13,7 +13,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = etherpad-lite branch = etherpad-lite
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -51,7 +51,7 @@ eggs = ...@@ -51,7 +51,7 @@ eggs =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = re6st-master branch = re6st-master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -36,7 +36,7 @@ KVM instance parameters: ...@@ -36,7 +36,7 @@ KVM instance parameters:
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
- frontend-software-type (default: frontend) - frontend-software-type (default: frontend)
- frontend-software-url (default: http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg) - frontend-software-url (default: https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg)
- frontend-instance-guid - frontend-instance-guid
- frontend-instance-name (default: VNC Frontend) - frontend-instance-name (default: VNC Frontend)
- nbd-port (default: 1024) - nbd-port (default: 1024)
...@@ -102,7 +102,7 @@ Resilient KVM instance ...@@ -102,7 +102,7 @@ Resilient KVM instance
Like KVM instance, but backed-up (with history) in two places. Like KVM instance, but backed-up (with history) in two places.
:: ::
kvm = 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.188:/software/kvm/software.cfg' kvm = 'https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.188/software/kvm/software.cfg'
myresilientkvm = request( myresilientkvm = request(
software_release=kvm, software_release=kvm,
partition_reference="My resilient KVM", partition_reference="My resilient KVM",
......
...@@ -18,7 +18,7 @@ develop = ...@@ -18,7 +18,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = kvm-cluster branch = kvm-cluster
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg" "default": "https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg"
} }
}, },
"type": "object" "type": "object"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg" "default": "https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg"
}, },
"slave-frontend-dict": { "slave-frontend-dict": {
"title": "Slave Front end definition", "title": "Slave Front end definition",
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{% set ipv6 = (ipv6 | list)[0] -%} {% set ipv6 = (ipv6 | list)[0] -%}
{% set frontend_dict = slapparameter_dict.get('frontend', {}) -%} {% set frontend_dict = slapparameter_dict.get('frontend', {}) -%}
{% set slave_frontend_dict = slapparameter_dict.get('slave-frontend', {}) -%} {% set slave_frontend_dict = slapparameter_dict.get('slave-frontend', {}) -%}
{% set slave_frontend_sr = slave_frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') -%} {% set slave_frontend_sr = slave_frontend_dict.get('software-url', 'https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg') -%}
{% set slave_frontend_stype = slave_frontend_dict.get('software-type', 'custom-personal') -%} {% set slave_frontend_stype = slave_frontend_dict.get('software-type', 'custom-personal') -%}
{% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%} {% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
{% set kvm_instance_dict = {} -%} {% set kvm_instance_dict = {} -%}
...@@ -34,7 +34,7 @@ state = stopped ...@@ -34,7 +34,7 @@ state = stopped
config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }} config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }} config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg')) }} config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg')) }}
config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }} config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
config-name = {{ instance_name }} config-name = {{ instance_name }}
{% if slapparameter_dict.get('authorized-keys', []) -%} {% if slapparameter_dict.get('authorized-keys', []) -%}
......
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
"description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg" "default": "https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg"
} }
} }
} }
...@@ -337,7 +337,7 @@ port = 8026 ...@@ -337,7 +337,7 @@ port = 8026
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Monitor {{ slapparameter_dict.get('name', '') }} Frontend name = Monitor {{ slapparameter_dict.get('name', '') }} Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = ${monitor-parameters:url} config-url = ${monitor-parameters:url}
software-type = {{ slapparameter_dict.get('monitor-frontend-software-type', frontend_software_type) }} software-type = {{ slapparameter_dict.get('monitor-frontend-software-type', frontend_software_type) }}
...@@ -533,7 +533,7 @@ backup = ${logrotate:backup} ...@@ -533,7 +533,7 @@ backup = ${logrotate:backup}
[slap-parameter] [slap-parameter]
# Default values if not specified # Default values if not specified
frontend-software-type = frontend frontend-software-type = frontend
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg frontend-software-url = https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.92/software/kvm/software.cfg
frontend-instance-guid = frontend-instance-guid =
frontend-instance-name = VNC Frontend frontend-instance-name = VNC Frontend
nbd-port = 1024 nbd-port = 1024
......
...@@ -28,7 +28,7 @@ setup = ${slapos.toolbox-repository:location} ...@@ -28,7 +28,7 @@ setup = ${slapos.toolbox-repository:location}
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = slaprunner-paas branch = slaprunner-paas
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
develop = true develop = true
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}, },
"slapos-repository": { "slapos-repository": {
"title": "SlapOS Git Repository URL", "title": "SlapOS Git Repository URL",
"description": "url of the default git repository that will be download by the runner while its instanciation. Will be cloned in a directory named 'slapos' (default is http://git.erp5.org/repos/slapos.git)", "description": "url of the default git repository that will be download by the runner while its instanciation. Will be cloned in a directory named 'slapos' (default is https://lab.nexedi.com/nexedi/slapos.git)",
"type": "string", "type": "string",
"format": "uri", "format": "uri",
"pattern": "^(http|https|ftp)://" "pattern": "^(http|https|ftp)://"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
}, },
"custom-frontend-software-url": { "custom-frontend-software-url": {
"title": "Custom Frontend Software URL", "title": "Custom Frontend Software URL",
"description": "Software Url of the frontend you request (ie.: http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg)", "description": "Software Url of the frontend you request (ie.: https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg)",
"type": "string", "type": "string",
"format": "uri" "format": "uri"
}, },
......
...@@ -62,7 +62,7 @@ offline = true ...@@ -62,7 +62,7 @@ offline = true
{% if slapparameter_dict.get('custom-frontend-backend-url') -%} {% if slapparameter_dict.get('custom-frontend-backend-url') -%}
[request-custom-frontend] [request-custom-frontend]
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }} software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg') }}
software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }} software-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }}
slave = true slave = true
name = Custom Web Frontend name = Custom Web Frontend
...@@ -418,7 +418,7 @@ name = example.com ...@@ -418,7 +418,7 @@ name = example.com
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = SlapRunner Frontend name = SlapRunner Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = $${slaprunner:access-url} config-url = $${slaprunner:access-url}
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
...@@ -429,7 +429,7 @@ return = site_url domain ...@@ -429,7 +429,7 @@ return = site_url domain
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Monitor Frontend name = Monitor Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port} config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port}
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
...@@ -490,7 +490,7 @@ user-authorized-key = ...@@ -490,7 +490,7 @@ user-authorized-key =
instance-amount = 10 instance-amount = 10
debug = false debug = false
frontend-domain = frontend-domain =
slapos-repository = http://git.erp5.org/repos/slapos.git slapos-repository = https://lab.nexedi.com/nexedi/slapos.git
slapos-software = slapos-software =
slapos-software-type = slapos-software-type =
slapos-reference = master slapos-reference = master
......
...@@ -17,7 +17,7 @@ parts = ...@@ -17,7 +17,7 @@ parts =
# Local development # Local development
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -12,7 +12,7 @@ develop += ...@@ -12,7 +12,7 @@ develop +=
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = hexaglobe-watermarking branch = hexaglobe-watermarking
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -163,7 +163,7 @@ command = $${logrotate:wrapper} ...@@ -163,7 +163,7 @@ command = $${logrotate:wrapper}
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id} name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id}
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = http://[$${instance-parameter:ipv6-random}]:5000 config-url = http://[$${instance-parameter:ipv6-random}]:5000
return = site_url return = site_url
......
...@@ -28,7 +28,7 @@ git-executable = ${git:location}/bin/git ...@@ -28,7 +28,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = lamp-edge branch = lamp-edge
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -149,7 +149,7 @@ create = true ...@@ -149,7 +149,7 @@ create = true
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Frontend name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ config-url = http://[$${apache-php:ip}]:$${apache-php:port}/
return = site_url return = site_url
......
...@@ -34,7 +34,7 @@ git-executable = ${git:location}/bin/git ...@@ -34,7 +34,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = master branch = master
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -25,7 +25,7 @@ Hot to install Maarch with SlapOS ...@@ -25,7 +25,7 @@ Hot to install Maarch with SlapOS
The command line to request a partition is: The command line to request a partition is:
slapos request /etc/opt/slapos/slapos-client.cfg maarch-instance-name \ slapos request /etc/opt/slapos/slapos-client.cfg maarch-instance-name \
http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.159:/software/maarch/software.cfg \ https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.159/software/maarch/software.cfg \
--type=resilient --configuration maarch-sql-data-file=/tmp/data.sql --type=resilient --configuration maarch-sql-data-file=/tmp/data.sql
If you are not migrating data, don't provide the maarch-sql-data-file parameter. If you are not migrating data, don't provide the maarch-sql-data-file parameter.
......
...@@ -23,7 +23,7 @@ develop = ...@@ -23,7 +23,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
revision = 7285bc913e6ea46a36ad2a887af6e9fab010ca74 revision = 7285bc913e6ea46a36ad2a887af6e9fab010ca74
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -136,7 +136,7 @@ authorized-key = ...@@ -136,7 +136,7 @@ authorized-key =
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Frontend name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = $${mioga-url:direct_url} config-url = $${mioga-url:direct_url}
return = site_url return = site_url
......
...@@ -38,7 +38,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link ...@@ -38,7 +38,7 @@ command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone -b nosqltestbed --quiet http://git.erp5.org/repos/slapos.git "${:location}" command = "${git:location}/bin/git" clone -b nosqltestbed --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}"
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream} update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream}
[eggs] [eggs]
......
...@@ -98,7 +98,7 @@ git_param =--quiet -b pulse ...@@ -98,7 +98,7 @@ git_param =--quiet -b pulse
git = ${git:location}/bin/git git = ${git:location}/bin/git
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true stop-on-error = true
command = "${:git}" clone ${:git_param} http://git.erp5.org/repos/slapos.git "${:location}" || exit 1; command = "${:git}" clone ${:git_param} https://lab.nexedi.com/nexedi/slapos.git "${:location}" || exit 1;
update-command = cd "${:location}" && "${:git}" fetch --quiet && "${:git}" reset --hard @{upstream} update-command = cd "${:location}" && "${:git}" fetch --quiet && "${:git}" reset --hard @{upstream}
[instance-recipe-egg] [instance-recipe-egg]
......
...@@ -12,7 +12,7 @@ develop = ...@@ -12,7 +12,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = slaprunner branch = slaprunner
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -434,7 +434,7 @@ path = ...@@ -434,7 +434,7 @@ path =
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Frontend name = Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = http://[$${slap-network-information:global-ipv6}]:8080 config-url = http://[$${slap-network-information:global-ipv6}]:8080
return = site_url return = site_url
......
...@@ -157,7 +157,7 @@ stop-on-error = true ...@@ -157,7 +157,7 @@ stop-on-error = true
branch = trac branch = trac
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet https://lab.nexedi.com/nexedi/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
[check-recipe] [check-recipe]
......
...@@ -31,7 +31,7 @@ git-executable = ${git:location}/bin/git ...@@ -31,7 +31,7 @@ git-executable = ${git:location}/bin/git
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = tt-rss branch = tt-rss
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -14,7 +14,7 @@ develop = ...@@ -14,7 +14,7 @@ develop =
[slapos.cookbook-repository] [slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git repository = https://lab.nexedi.com/nexedi/slapos.git
branch = zimbra-kvm branch = zimbra-kvm
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
......
...@@ -206,7 +206,7 @@ sla-instance_guid = $${slap-parameter:frontend-instance-guid} ...@@ -206,7 +206,7 @@ sla-instance_guid = $${slap-parameter:frontend-instance-guid}
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Web Frontend name = Web Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg
slave = true slave = true
config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/ config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/
return = site_url return = site_url
...@@ -217,7 +217,7 @@ config-custom_domain = $${slap-parameter:domain} ...@@ -217,7 +217,7 @@ config-custom_domain = $${slap-parameter:domain}
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = SMTP Frontend name = SMTP Frontend
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
#software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/zimbra-kvm:/software/reverse-proxy-nginx/development.cfg #software-url = https://lab.nexedi.com/nexedi/slapos/raw/zimbra-kvm/software/reverse-proxy-nginx/development.cfg
software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg software-url = /opt/slapdev/software/reverse-proxy-nginx/development.cfg
slave = true slave = true
config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6} config-smtp-upstream-host = $${tunnel-ipv6-kvm-smtp:ipv6}
...@@ -238,7 +238,7 @@ smtp-listening-ipv4 = $${request-smtp-frontend:connection-listening-ipv4} ...@@ -238,7 +238,7 @@ smtp-listening-ipv4 = $${request-smtp-frontend:connection-listening-ipv4}