fixup! enable haproxy admin socket and install haproxyctl script.

837f4bd3 · Kazuhiko Shiozaki · e7083872 · 837f4bd3
Commit 837f4bd3 authored Jun 24, 2013 by Kazuhiko Shiozaki
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

slapos/recipe/haproxy/__init__.py slapos/recipe/haproxy/__init__.py +2 -2

No files found.
--- a/slapos/recipe/haproxy/__init__.py
+++ b/slapos/recipe/haproxy/__init__.py
@@ -112,8 +112,8 @@ class Recipe(GenericBaseRecipe):
      self.options['conf-path'],
      self.substituteTemplate(
        self.getTemplateFilename('haproxy.cfg.in'),
-        {'socket_path': self.options['socket-path']},
+        {'socket_path': self.options['socket-path'],
-        {'server_text': server_snippet},
+         'server_text': server_snippet},
      )
    )
    wrapper_path = self.createPythonScript(