pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Fixed php init vars bad order on fcgid backend

This commit is contained in:
Marc 2014-11-10 10:24:20 +00:00
parent dbf64f2562
commit f9c6a5b9cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/apps/webapps/backends/phpfcgid.py
View File

@ -46,7 +46,7 @@ class PHPFcgidBackend(WebAppServiceMixin, ServiceController):
context = super(PHPFcgidBackend, self).get_context(webapp) context = super(PHPFcgidBackend, self).get_context(webapp)
init_vars = self.get_php_init_vars(webapp) init_vars = self.get_php_init_vars(webapp)
if init_vars: 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) init_vars = ', -d '.join(init_vars)
context['init_vars'] = '-d %s' % init_vars context['init_vars'] = '-d %s' % init_vars
else: else:

2
orchestra/apps/webapps/backends/phpfpm.py
View File

@ -65,7 +65,7 @@ class PHPFPMBackend(WebAppServiceMixin, ServiceController):
listen.group = {{ group }} listen.group = {{ group }}
pm = ondemand pm = ondemand
pm.max_children = 4 pm.max_children = 4
{% for name,value in init_vars %} {% for name, value in init_vars %}
php_admin_value[{{ name | safe }}] = {{ value | safe }}{% endfor %}""" php_admin_value[{{ name | safe }}] = {{ value | safe }}{% endfor %}"""
)) ))
context.update({ context.update({