From f9c6a5b9cc0a55df48f1ac409bb4175595fff98b Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 10 Nov 2014 10:24:20 +0000 Subject: [PATCH] Fixed php init vars bad order on fcgid backend --- orchestra/apps/webapps/backends/phpfcgid.py | 2 +- orchestra/apps/webapps/backends/phpfpm.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/orchestra/apps/webapps/backends/phpfcgid.py b/orchestra/apps/webapps/backends/phpfcgid.py index a6447a70..d7c7257c 100644 --- a/orchestra/apps/webapps/backends/phpfcgid.py +++ b/orchestra/apps/webapps/backends/phpfcgid.py @@ -46,7 +46,7 @@ class PHPFcgidBackend(WebAppServiceMixin, ServiceController): context = super(PHPFcgidBackend, self).get_context(webapp) init_vars = self.get_php_init_vars(webapp) if init_vars: - init_vars = [ '%s="%s"' % (k,v) for v,k in init_vars ] + init_vars = [ '%s="%s"' % (k,v) for k,v in init_vars ] init_vars = ', -d '.join(init_vars) context['init_vars'] = '-d %s' % init_vars else: diff --git a/orchestra/apps/webapps/backends/phpfpm.py b/orchestra/apps/webapps/backends/phpfpm.py index 5fe378d2..72f48f43 100644 --- a/orchestra/apps/webapps/backends/phpfpm.py +++ b/orchestra/apps/webapps/backends/phpfpm.py @@ -65,7 +65,7 @@ class PHPFPMBackend(WebAppServiceMixin, ServiceController): listen.group = {{ group }} pm = ondemand pm.max_children = 4 - {% for name,value in init_vars %} + {% for name, value in init_vars %} php_admin_value[{{ name | safe }}] = {{ value | safe }}{% endfor %}""" )) context.update({