diff --git a/software/ajaxplorer/instance-apachephp.cfg b/software/ajaxplorer/instance-apachephp.cfg index a707991b84f54471e5d79b18180e0ad2c5812c02..ee7318aab9f056c6f6fe2e66244817aafec416a4 100644 --- a/software/ajaxplorer/instance-apachephp.cfg +++ b/software/ajaxplorer/instance-apachephp.cfg @@ -370,7 +370,7 @@ curl_path = ${curl:location}/bin/curl domain = domain2 = domain3 = -frontend-software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg # Default value if no ssh parameter is specified logbox-ip = logbox-port = diff --git a/software/ajaxplorer/software.cfg b/software/ajaxplorer/software.cfg index 55efc4c87a5590251904c871190e2c78b9a53028..4f4df2ccf1b0201bd48982244b7f12d3b38af3cd 100644 --- a/software/ajaxplorer/software.cfg +++ b/software/ajaxplorer/software.cfg @@ -35,7 +35,7 @@ md5sum = 4c7936accb3658871b635158198b7905 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-apachephp.cfg output = ${buildout:directory}/template-apachephp.cfg -md5sum = fad783803d52eb8786041852c3007960 +md5sum = 8be713bd2656e184651c8ec10579d668 mode = 0644 [instance-mariadb] diff --git a/software/apache-frontend/README.apache_frontend.txt b/software/apache-frontend/README.apache_frontend.txt index d48e120a5ce2b9a1160762d6674bd9709abe10b7..50d621058d6e8014c219023fa31236cb2378e1a7 100644 --- a/software/apache-frontend/README.apache_frontend.txt +++ b/software/apache-frontend/README.apache_frontend.txt @@ -33,7 +33,7 @@ ex: <parameter id="-frontend-type">custom-personal</parameter> <parameter id="-frontend-2-state">stopped</parameter> <parameter id="-sla-3-computer_guid">COMP-1234</parameter> -<parameter id="-frontend-software-release-url">https://lab.nexedi.com/nexedi/slapos/raw/slapos-0.183/software/apache-frontend/software.cfg</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> 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. diff --git a/software/davstorage/common.cfg b/software/davstorage/common.cfg index 62e42a111b6af05bb21ab7b81ae9f295dbbcb709..90763eb2a967bdcd7262b95a9b091b74149dc133 100644 --- a/software/davstorage/common.cfg +++ b/software/davstorage/common.cfg @@ -44,6 +44,6 @@ mode = 0644 [instance-davstorage] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-davstorage.cfg -md5sum = 32d2af50e57e8bc29002c89d062365c8 +md5sum = b83b0351a0f46aac35d52e681270ff03 output = ${buildout:directory}/template-davstorage.cfg mode = 0644 diff --git a/software/davstorage/instance-davstorage.cfg b/software/davstorage/instance-davstorage.cfg index 05ffa570954c8aafb12e35d262fcb76579436198..f0f208b0f21d01d53b433e3e4f14a3a91d0e8f67 100644 --- a/software/davstorage/instance-davstorage.cfg +++ b/software/davstorage/instance-davstorage.cfg @@ -164,7 +164,7 @@ tmp-php = $${rootdirectory:tmp}/php recipe = slapos.cookbook:request name = Frontend Ajax # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-https-only = true config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/ @@ -175,7 +175,7 @@ return = domain recipe = slapos.cookbook:request name = Frontend Webdav # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-https-only = true config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/ diff --git a/software/etherpad-lite/common.cfg b/software/etherpad-lite/common.cfg index b720ddce2d3eecfeb789b2ccc5c290a2cba4237a..2923ca54d81913e64c88afa13385c97eff20d643 100644 --- a/software/etherpad-lite/common.cfg +++ b/software/etherpad-lite/common.cfg @@ -58,7 +58,7 @@ mode = 0644 [instance-etherpad-lite] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-etherpad-lite.cfg -md5sum = f997a82436a6276fa6d29b794bb7eb54 +md5sum = 28710a9a23320dd472387d81a698d12d output = ${buildout:directory}/template-etherpad-lite.cfg mode = 0644 diff --git a/software/etherpad-lite/instance-etherpad-lite.cfg b/software/etherpad-lite/instance-etherpad-lite.cfg index 3cc08baf5845e0334745b3bcb6a343e917638f4c..2f24e0dfb0a5c073cedc09c9fef33b2dd03b14b3 100644 --- a/software/etherpad-lite/instance-etherpad-lite.cfg +++ b/software/etherpad-lite/instance-etherpad-lite.cfg @@ -65,7 +65,7 @@ command-line = $${etherpad-run-script:output} -s $${etherpad-run-script:etherpad recipe = slapos.cookbook:request name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://$${etherpad-conf-generation:ip}:$${etherpad-conf-generation:port} return = site_url diff --git a/software/kvm/common.cfg b/software/kvm/common.cfg index 08ec46f96c86dc30555f5277137facb122c05fd5..24952639b0bdeefa2f1271ac4787b83ac315f171 100644 --- a/software/kvm/common.cfg +++ b/software/kvm/common.cfg @@ -98,7 +98,7 @@ mode = 0644 recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2 mode = 644 -md5sum = b7928c5a5c994bc3894b3c402a92d7c8 +md5sum = 88e1437391d21a49b50848689b1221e5 download-only = true on-update = true @@ -106,7 +106,7 @@ on-update = true recipe = hexagonit.recipe.download url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in mode = 644 -md5sum = 52c676d044d25974880710e0dd7ef0a1 +md5sum = f61e033aedaa8e9836795e36fd12e51d download-only = true on-update = true diff --git a/software/kvm/instance-kvm-cluster-input-schema.json b/software/kvm/instance-kvm-cluster-input-schema.json index 4befd989aef3e94404f9e9a66abc1f457d5ee3ac..01c8ad4156db7b788a6b28b1fe3f85c6fbe6311e 100644 --- a/software/kvm/instance-kvm-cluster-input-schema.json +++ b/software/kvm/instance-kvm-cluster-input-schema.json @@ -50,7 +50,7 @@ "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".", "type": "string", "format": "uri", - "default": "https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg" + "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg" }, "slave-frontend-dict": { "title": "Slave Front end definition", diff --git a/software/kvm/instance-kvm-cluster.cfg.jinja2.in b/software/kvm/instance-kvm-cluster.cfg.jinja2.in index e4c737457085f3f1be38f7d9852051547ff52442..9ee2bf593651559e12e35f9174e81373baf618d2 100644 --- a/software/kvm/instance-kvm-cluster.cfg.jinja2.in +++ b/software/kvm/instance-kvm-cluster.cfg.jinja2.in @@ -3,7 +3,7 @@ {% set ipv6 = (ipv6 | list)[0] -%} {% set frontend_dict = slapparameter_dict.get('frontend', {}) -%} {% set slave_frontend_dict = slapparameter_dict.get('slave-frontend', {}) -%} -{% 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_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_stype = slave_frontend_dict.get('software-type', 'custom-personal') -%} {% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%} {% set kvm_instance_dict = {} -%} diff --git a/software/kvm/instance-kvm.cfg.jinja2 b/software/kvm/instance-kvm.cfg.jinja2 index 5a259387dfce4d85cba6808211010a80a5b28cc1..f4b0a52fe7043edc690b02b52a9cf4d8371c5d41 100644 --- a/software/kvm/instance-kvm.cfg.jinja2 +++ b/software/kvm/instance-kvm.cfg.jinja2 @@ -337,7 +337,7 @@ port = 8026 recipe = slapos.cookbook:requestoptional name = Monitor {{ slapparameter_dict.get('name', '') }} Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = ${monitor-parameters:url} software-type = {{ slapparameter_dict.get('monitor-frontend-software-type', frontend_software_type) }} diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index 13051c3d808647f70ba149348e95a9a590f3170a..f1a507852a2f5967613ccb41a586907d16bf7c0b 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -54,7 +54,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-runner.cfg output = ${buildout:directory}/template-runner.cfg.in -md5sum = 69aa7e6af335d3fb3ad8fc4c90fafe7a +md5sum = 61297b0882cc9d674f4099b8abdd413f mode = 0644 [template-runner-import-script] diff --git a/software/slaprunner/instance-runner-input-schema.json b/software/slaprunner/instance-runner-input-schema.json index d3296b60cb0cfbb030888d5859f3fa25d3b5b17a..97ce92df4f2a053cbfa28e70cb513632d1a6917b 100644 --- a/software/slaprunner/instance-runner-input-schema.json +++ b/software/slaprunner/instance-runner-input-schema.json @@ -80,7 +80,7 @@ }, "custom-frontend-software-url": { "title": "Custom Frontend Software URL", - "description": "Software Url of the frontend you request (ie.: https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg)", + "description": "Software Url of the frontend you request (ie.: http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg)", "type": "string", "format": "uri" }, diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index f2a563fe378eb0f0dbdc65ba1527cf24d45feb93..e4b5a30a187ee3f56e5e6aaef9b70dbc29aeeb85 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -62,7 +62,7 @@ offline = true {% if slapparameter_dict.get('custom-frontend-backend-url') -%} [request-custom-frontend] recipe = slapos.cookbook:requestoptional -software-url = {{ slapparameter_dict.get('custom-frontend-software-url', 'https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg') }} +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-type = {{ slapparameter_dict.get('custom-frontend-software-type', 'RootSoftwareInstance') }} slave = true name = Custom Web Frontend @@ -418,7 +418,7 @@ name = example.com recipe = slapos.cookbook:requestoptional name = SlapRunner Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = $${slaprunner:access-url} config-domain = $${slap-parameter:frontend-domain} @@ -429,7 +429,7 @@ return = site_url domain recipe = slapos.cookbook:requestoptional name = Monitor Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port} config-domain = $${slap-parameter:frontend-domain} diff --git a/software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in b/software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in index 48278a61478af33b733ac89dc644afd62657ec70..3385a800884058da41967d7ead395e5e97679cef 100644 --- a/software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in +++ b/software/unstable/hexaglobe-watermarking/instance-watermarking.cfg.in @@ -163,7 +163,7 @@ command = $${logrotate:wrapper} recipe = slapos.cookbook:requestoptional name = Frontend for $${slap-connection:computer-id} $${slap-connection:partition-id} # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://[$${instance-parameter:ipv6-random}]:5000 return = site_url diff --git a/software/unstable/lamp-generic/instance-apache-php.cfg.in b/software/unstable/lamp-generic/instance-apache-php.cfg.in index 1b3bef953c05c2eebac092f8d8d3307d0847fa6b..ee2302fe0bb4a92b2b417bec89b83cad5c158493 100644 --- a/software/unstable/lamp-generic/instance-apache-php.cfg.in +++ b/software/unstable/lamp-generic/instance-apache-php.cfg.in @@ -149,7 +149,7 @@ create = true recipe = slapos.cookbook:requestoptional name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ return = site_url diff --git a/software/unstable/lamp-generic/software.cfg b/software/unstable/lamp-generic/software.cfg index 7610aae3acf90c2ae29be4aec62b756e846c44ee..909e2a06be12b78ccfcc9e1ad331c6e928763115 100644 --- a/software/unstable/lamp-generic/software.cfg +++ b/software/unstable/lamp-generic/software.cfg @@ -13,7 +13,7 @@ md5sum = 26ac6629a83869140189a85e581e822f [instance-apache-php] url = ${:_profile_base_location_}/instance-apache-php.cfg.in -md5sum = 10ae5ae626927723a8a7880e4c15c4d8 +md5sum = 062e77e6be6cda965cfdd0e6011df86e [instance-edge] recipe = slapos.recipe.template diff --git a/software/unstable/mioga/instance-apacheperl.cfg b/software/unstable/mioga/instance-apacheperl.cfg index dcaf85f42deded047d22b31b131cd4ce8292c7d1..0ccb562f1169018dc5e54b89e72a2ac6ee4b05d0 100644 --- a/software/unstable/mioga/instance-apacheperl.cfg +++ b/software/unstable/mioga/instance-apacheperl.cfg @@ -136,7 +136,7 @@ authorized-key = recipe = slapos.cookbook:requestoptional name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = $${mioga-url:direct_url} return = site_url diff --git a/software/unstable/trac-svn/instance-trac.cfg b/software/unstable/trac-svn/instance-trac.cfg index 08e6ff5b154cc73d0cfbe6d5acd6cf7ea2148322..a1c16fe38fb52a0e3df241e4236d8fed301f60d7 100644 --- a/software/unstable/trac-svn/instance-trac.cfg +++ b/software/unstable/trac-svn/instance-trac.cfg @@ -434,7 +434,7 @@ path = recipe = slapos.cookbook:requestoptional name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://[$${slap-network-information:global-ipv6}]:8080 return = site_url diff --git a/software/unstable/trac-svn/software.cfg b/software/unstable/trac-svn/software.cfg index 193b5b151175b5bd59859493e991ed308fdf1d9f..46e7013ed455b265a742a36f20d9f3be64a5361f 100644 --- a/software/unstable/trac-svn/software.cfg +++ b/software/unstable/trac-svn/software.cfg @@ -84,7 +84,7 @@ md5sum = bc6ed91a1862a10af661713aa0691848 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-trac.cfg output = ${buildout:directory}/template-trac.cfg -md5sum = f34ac787cfaa7198a096494acc69b444 +md5sum = 2dc7ebfa9b7d5117274b74bafed4cfd4 mode = 0644 [instance-mariadb] diff --git a/software/unstable/zimbra-kvm/instance-kvm.cfg.in b/software/unstable/zimbra-kvm/instance-kvm.cfg.in index c91c34bae5b4a36018d3a56dacc3741e9202b8e1..25dd17ed6da93065244874da1389a295da989d65 100644 --- a/software/unstable/zimbra-kvm/instance-kvm.cfg.in +++ b/software/unstable/zimbra-kvm/instance-kvm.cfg.in @@ -206,7 +206,7 @@ sla-instance_guid = $${slap-parameter:frontend-instance-guid} recipe = slapos.cookbook:requestoptional name = Web Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = https://[$${tunnel-ipv6-kvm-https:ipv6}]:$${tunnel-ipv6-kvm-https:ipv6-port}/ return = site_url diff --git a/stack/boinc/buildout.cfg b/stack/boinc/buildout.cfg index 405bde5cfa8f1a0d044d68f70caa6ac81578d7a9..e6cf5c00fede13d9bb2b40b4c27dddc7bc7adea5 100644 --- a/stack/boinc/buildout.cfg +++ b/stack/boinc/buildout.cfg @@ -34,7 +34,7 @@ eggs = recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-boinc.cfg output = ${buildout:directory}/template-boinc.cfg -md5sum = c3c7878a95ca6f779fa0470b53b84726 +md5sum = 5eb6057311fb1f73a54b72a40ead47c2 mode = 0644 #Template for deploying MySQL Database Server diff --git a/stack/boinc/instance-boinc.cfg b/stack/boinc/instance-boinc.cfg index eba611a03be08c0dce41b7e53c723e2a8c9515e7..47a8b47e0a8facde12074ee9b6abc9bb2006417a 100644 --- a/stack/boinc/instance-boinc.cfg +++ b/stack/boinc/instance-boinc.cfg @@ -300,7 +300,7 @@ command = PATH=$${rootdirectory:bin}:$PATH $${boinc-server:installroot}/bin/star recipe = slapos.cookbook:requestoptional name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ return = site_url diff --git a/stack/lamp/apache/instance-apache-php.cfg.in b/stack/lamp/apache/instance-apache-php.cfg.in index 01133cb99bac5ddcf929e3fe22819821fb330154..6e963fa6c381857a5716d98bbb5fa68023506f33 100644 --- a/stack/lamp/apache/instance-apache-php.cfg.in +++ b/stack/lamp/apache/instance-apache-php.cfg.in @@ -247,7 +247,7 @@ create = true recipe = slapos.cookbook:requestoptional name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://[$${apache-network-configuration:listening-ip}]:$${apache-network-configuration:listening-port}/ return = site_url diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index bdc847bc35af9b892a04989bf1b533127174caea..3a2b4c4cfda3ccec9f811ea2ef12ed4cc6c88ec7 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -74,7 +74,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in output = ${buildout:directory}/instance-apache-php.cfg -md5sum = 33697d79ddd2c655fa686d87cb1223a7 +md5sum = 963ec2e460b281405b9e0e2748a27e62 mode = 0644 [instance-apache-import] diff --git a/stack/lapp/apache/instance-apache-php.cfg.in b/stack/lapp/apache/instance-apache-php.cfg.in index c7d694a3e35b1f57f25aab27a3510b42a285f975..b30a99640f257c7c3612beccab914cad25271e83 100644 --- a/stack/lapp/apache/instance-apache-php.cfg.in +++ b/stack/lapp/apache/instance-apache-php.cfg.in @@ -232,7 +232,7 @@ create = true recipe = slapos.cookbook:requestoptional name = Frontend # XXX We have hardcoded SR URL here. -software-url = https://lab.nexedi.com/nexedi/slapos/raw/HEAD/software/apache-frontend/software.cfg +software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg slave = true config-url = http://[$${apache-php:ip}]:$${apache-php:port}/ return = site_url diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg index 768398d75dd4936264e7eb9283cce5134c1f7c2b..12c65cb41d0825b5c0319784220e615ff4ac4b60 100644 --- a/stack/lapp/buildout.cfg +++ b/stack/lapp/buildout.cfg @@ -62,7 +62,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/apache/instance-apache-php.cfg.in output = ${buildout:directory}/instance-apache-php.cfg -md5sum = f9eb15b0e53e4ea8cb2e7f9a9ea84361 +md5sum = 8b9e7ac376cad5235e88a45ece817e6b mode = 0644 [instance-apache-import]