Drop fastcgi_params supprort

pull/35/head
Emilien Mantel 2018-03-17 14:02:08 +01:00
parent dd7834e8ce
commit 6cae501266
8 changed files with 1 additions and 51 deletions

View File

@ -31,7 +31,6 @@
- regexp: '^fastcgi_param DOCUMENT_ROOT' - regexp: '^fastcgi_param DOCUMENT_ROOT'
line: 'fastcgi_param DOCUMENT_ROOT $realpath_root;' line: 'fastcgi_param DOCUMENT_ROOT $realpath_root;'
- -
- '{{ nginx_etc_dir }}/fastcgi_params'
- '{{ nginx_etc_dir }}/fastcgi.conf' - '{{ nginx_etc_dir }}/fastcgi.conf'
when: nginx_fastcgi_fix_realpath when: nginx_fastcgi_fix_realpath

View File

@ -45,27 +45,6 @@
- sites-available - sites-available
- sites-enabled - 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 - name: FILE | Create log directory
file: file:
path: "{{ nginx_log_dir }}" path: "{{ nginx_log_dir }}"

View File

@ -25,7 +25,7 @@
{% block template_upstream_location %} {% block template_upstream_location %}
location ~ \.cgi$ { location ~ \.cgi$ {
gzip off; gzip off;
include {{ nginx_etc_dir }}/fastcgi_params; include fastcgi.conf;
fastcgi_pass unix:/var/run/fcgiwrap.socket; fastcgi_pass unix:/var/run/fcgiwrap.socket;
fastcgi_index BackupPC_Admin; fastcgi_index BackupPC_Admin;
fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME /usr/share/backuppc/cgi-bin$fastcgi_script_name;

View File

@ -46,11 +46,7 @@
location /cgi-bin { location /cgi-bin {
{% endif %} {% endif %}
try_files $uri =404; try_files $uri =404;
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
fastcgi_pass unix:{{ nginx_fcgiwrap_sock }}; fastcgi_pass unix:{{ nginx_fcgiwrap_sock }};
fastcgi_param AUTH_USER $remote_user; fastcgi_param AUTH_USER $remote_user;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;
@ -58,10 +54,6 @@
location ~ \.php$ { location ~ \.php$ {
fastcgi_pass {{ php_upstream }}; fastcgi_pass {{ php_upstream }};
fastcgi_index index.php; fastcgi_index index.php;
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
} }
{% endblock %} {% endblock %}

View File

@ -42,11 +42,7 @@
fastcgi_param PATH /usr/local/bin:/usr/bin:/bin; fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
fastcgi_param modHeadersAvailable true; fastcgi_param modHeadersAvailable true;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
} }
location ~ \.php(?:$|/) { location ~ \.php(?:$|/) {
@ -57,11 +53,7 @@
fastcgi_param PATH /usr/local/bin:/usr/bin:/bin; fastcgi_param PATH /usr/local/bin:/usr/bin:/bin;
fastcgi_param modHeadersAvailable true; fastcgi_param modHeadersAvailable true;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
} }
{% endblock %} {% endblock %}

View File

@ -29,10 +29,6 @@
{{ param }} {{ param }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
} }
{% endblock %} {% endblock %}

View File

@ -10,11 +10,7 @@
{{ param }} {{ param }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
} }
{% endblock %} {% endblock %}

View File

@ -14,10 +14,6 @@
{{ param }} {{ param }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if nginx_version.stdout | version_compare('1.6.1', 'lt') %}
include fastcgi_params;
{% else %}
include fastcgi.conf; include fastcgi.conf;
{% endif %}
} }
{% endblock %} {% endblock %}