From 58e440b7fa3ecf051c8c13f879356f40a701ca41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Wed, 16 May 2012 14:38:12 +0200 Subject: [PATCH] Don't publish several time urls. Reverts the effects of 8dba9b27ff94011348800bf97f5794531ad4ab27 but keep cleanup --- stack/lamp/buildout.cfg | 2 +- stack/lamp/instance-apache-php.cfg | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/stack/lamp/buildout.cfg b/stack/lamp/buildout.cfg index d4fe69349..9c79d5109 100644 --- a/stack/lamp/buildout.cfg +++ b/stack/lamp/buildout.cfg @@ -69,7 +69,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-apache-php.cfg output = ${buildout:directory}/template-apache-php.cfg -md5sum = b98e76abcf091ea0aee20d1ac59bb877 +md5sum = f8a1599f19a67d948f4a1f32f3bd3e2f mode = 0644 [template-apache-backup] diff --git a/stack/lamp/instance-apache-php.cfg b/stack/lamp/instance-apache-php.cfg index 201062090..56945b4de 100644 --- a/stack/lamp/instance-apache-php.cfg +++ b/stack/lamp/instance-apache-php.cfg @@ -9,9 +9,8 @@ parts = cron cron-entry-logrotate promise - publish-backend-connection-informations frontend-promise - publish-frontend-connection-informations + publish-connection-informations eggs-directory = ${buildout:eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory} @@ -29,12 +28,9 @@ path = $${basedirectory:promises}/frontend url = $${request-frontend:connection-site_url} dash_path = ${dash:location}/bin/dash -[publish-backend-connection-informations] +[publish-connection-informations] recipe = slapos.cookbook:publish backend_url = $${apache-php:url} - -[publish-frontend-connection-informations] -<= publish-backend-connection-informations url = $${request-frontend:connection-site_url} [mariadb-urlparse] -- 2.30.9