Drop fastcgi_params supprort
							parent
							
								
									dd7834e8ce
								
							
						
					
					
						commit
						6cae501266
					
				| 
						 | 
				
			
			@ -31,7 +31,6 @@
 | 
			
		|||
      - regexp: '^fastcgi_param  DOCUMENT_ROOT'
 | 
			
		||||
        line: 'fastcgi_param  DOCUMENT_ROOT      $realpath_root;'
 | 
			
		||||
    -
 | 
			
		||||
      - '{{ nginx_etc_dir }}/fastcgi_params'
 | 
			
		||||
      - '{{ nginx_etc_dir }}/fastcgi.conf'
 | 
			
		||||
  when: nginx_fastcgi_fix_realpath
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,27 +45,6 @@
 | 
			
		|||
    - sites-available
 | 
			
		||||
    - sites-enabled
 | 
			
		||||
 | 
			
		||||
- name: STAT | Check fastcgi.conf
 | 
			
		||||
  stat:
 | 
			
		||||
    path: "{{ nginx_etc_dir }}/fastcgi.conf"
 | 
			
		||||
  register: conf
 | 
			
		||||
 | 
			
		||||
- name: COPY | config
 | 
			
		||||
  command: "cp {{ nginx_etc_dir }}/fastcgi_params {{ nginx_etc_dir }}/fastcgi.conf"
 | 
			
		||||
  when: not conf.stat.exists
 | 
			
		||||
  notify: reload nginx
 | 
			
		||||
 | 
			
		||||
- name: LINEINFILE | Add fastcgi config
 | 
			
		||||
  lineinfile:
 | 
			
		||||
    line: "fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;"
 | 
			
		||||
    dest: "{{ nginx_etc_dir }}/fastcgi.conf"
 | 
			
		||||
  notify: reload nginx
 | 
			
		||||
 | 
			
		||||
- name: COPY | Populate proxy_params
 | 
			
		||||
  copy:
 | 
			
		||||
    content: "proxy_set_header Host $http_host;\nproxy_set_header X-Real-IP $remote_addr;\nproxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;proxy_set_header X-Forwarded-Proto $scheme;"
 | 
			
		||||
    dest: "{{ nginx_etc_dir }}/proxy_params"
 | 
			
		||||
 | 
			
		||||
- name: FILE | Create log directory
 | 
			
		||||
  file:
 | 
			
		||||
    path: "{{ nginx_log_dir }}"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -25,7 +25,7 @@
 | 
			
		|||
{% block template_upstream_location %}
 | 
			
		||||
	location ~ \.cgi$ {
 | 
			
		||||
		gzip off;
 | 
			
		||||
		include {{ nginx_etc_dir }}/fastcgi_params;
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
		fastcgi_pass unix:/var/run/fcgiwrap.socket;
 | 
			
		||||
		fastcgi_index BackupPC_Admin;
 | 
			
		||||
		fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,11 +46,7 @@
 | 
			
		|||
	location /cgi-bin {
 | 
			
		||||
{% endif %}
 | 
			
		||||
		try_files $uri =404;
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
		fastcgi_pass unix:{{ nginx_fcgiwrap_sock }};
 | 
			
		||||
		fastcgi_param AUTH_USER $remote_user;
 | 
			
		||||
		fastcgi_param REMOTE_USER $remote_user;
 | 
			
		||||
| 
						 | 
				
			
			@ -58,10 +54,6 @@
 | 
			
		|||
	location ~ \.php$ {
 | 
			
		||||
		fastcgi_pass {{ php_upstream }};
 | 
			
		||||
		fastcgi_index index.php;
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
	}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,11 +42,7 @@
 | 
			
		|||
		fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
 | 
			
		||||
		fastcgi_param modHeadersAvailable true;
 | 
			
		||||
		fastcgi_split_path_info ^(.+\.php)(/.+)$;
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	location ~ \.php(?:$|/) {
 | 
			
		||||
| 
						 | 
				
			
			@ -57,11 +53,7 @@
 | 
			
		|||
		fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
 | 
			
		||||
		fastcgi_param modHeadersAvailable true;
 | 
			
		||||
		fastcgi_split_path_info ^(.+\.php)(/.+)$;
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
	}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -29,10 +29,6 @@
 | 
			
		|||
		{{ param }}
 | 
			
		||||
{% endfor %}
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
	}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,11 +10,7 @@
 | 
			
		|||
		{{ param }}
 | 
			
		||||
{% endfor %}
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
	}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,10 +14,6 @@
 | 
			
		|||
		{{ param }}
 | 
			
		||||
{% endfor %}
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
 | 
			
		||||
		include fastcgi_params;
 | 
			
		||||
{% else %}
 | 
			
		||||
		include fastcgi.conf;
 | 
			
		||||
{% endif %}
 | 
			
		||||
	}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue