From eaca6fe61fd3d9669d320e71002b0b36fd71b6ff Mon Sep 17 00:00:00 2001
From: Gabriel Monnerat <gabriel@tiolive.com>
Date: Thu, 4 Aug 2011 16:57:25 -0300
Subject: [PATCH] fix syntax of template
---
slapos/recipe/apache/template/varnish.vcl.in | 4 ++--
slapos/recipe/apache/template/varnishd.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/slapos/recipe/apache/template/varnish.vcl.in b/slapos/recipe/apache/template/varnish.vcl.in
index 1f990848d..1113fe234 100644
--- a/slapos/recipe/apache/template/varnish.vcl.in
+++ b/slapos/recipe/apache/template/varnish.vcl.in
@@ -5,8 +5,8 @@
# server.
#
backend default {
- .host = "${:backend_host}";
- .port = "${:backend_port}";
+ .host = "%(backend_host)s";
+ .port = "%(backend_port)s";
.probe = {
.url = "/";
.timeout = 10s;
diff --git a/slapos/recipe/apache/template/varnishd.in b/slapos/recipe/apache/template/varnishd.in
index 3b45093e7..ad9082c49 100644
--- a/slapos/recipe/apache/template/varnishd.in
+++ b/slapos/recipe/apache/template/varnishd.in
@@ -1,2 +1,2 @@
#!/bin/sh
-exec %(varnishd_binary)s -F -n $(directory)s -P $(pid)s -f $(configuration_file) -a %(port)s -T %(control_port) -s $(storage)s
+exec %(varnishd_binary)s -F -n %(directory)s -P %(pid)s -f %(configuration_file)s -a %(port)s -T %(control_port)s -s %(storage)s
--
2.30.9