Browse Source

move to php7-fpm

python3
Andrea Cimbalo 7 years ago
parent
commit
0edab01bda
4 changed files with 16 additions and 6 deletions
  1. +1
    -1
      roles/dokuwiki/templates/dokuwiki.conf.nginx.j2
  2. +1
    -1
      roles/dokuwiki/templates/dokuwiki.conf.nginx.j2.TODO
  3. +13
    -2
      roles/nginx/tasks/main.yaml
  4. +1
    -2
      roles/roundcube/templates/roundcube.conf.nginx.j2

+ 1
- 1
roles/dokuwiki/templates/dokuwiki.conf.nginx.j2 View File

@ -22,6 +22,6 @@ server {
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200; fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
} }
} }

+ 1
- 1
roles/dokuwiki/templates/dokuwiki.conf.nginx.j2.TODO View File

@ -31,6 +31,6 @@ server {
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param REDIRECT_STATUS 200; fastcgi_param REDIRECT_STATUS 200;
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
} }
} }

+ 13
- 2
roles/nginx/tasks/main.yaml View File

@ -13,14 +13,23 @@
state: absent state: absent
notify: restart nginx notify: restart nginx
- name: install php5-fpm
- name: install php-fpm
apt: apt:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
update_cache: yes update_cache: yes
cache_valid_time: 3600 cache_valid_time: 3600
with_items: with_items:
- php5-fpm
- php-fpm
when: php | bool
notify:
- restart nginx
- name: add timezone to php.ini
lineinfile:
dest: /etc/php/7.0/fpm/php.ini
regexp: '^;?date.timezone ='
line: 'date.timezone = Europe/Berlin'
when: php | bool when: php | bool
notify: notify:
- restart nginx - restart nginx
@ -38,6 +47,8 @@
src: "roles/{{ parent_role_path }}/templates/{{ item }}.conf.nginx.j2" src: "roles/{{ parent_role_path }}/templates/{{ item }}.conf.nginx.j2"
dest: /etc/nginx/sites-available/{{ item }}.conf dest: /etc/nginx/sites-available/{{ item }}.conf
with_items: "{{ config_names }}" with_items: "{{ config_names }}"
notify:
- restart nginx
- name: add proxy to config_names - name: add proxy to config_names
set_fact: set_fact:


+ 1
- 2
roles/roundcube/templates/roundcube.conf.nginx.j2 View File

@ -12,8 +12,7 @@ server {
location ~ \.php$ { location ~ \.php$ {
include snippets/fastcgi-php.conf; include snippets/fastcgi-php.conf;
# With php5-fpm:
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
} }
#deny access to .htaccess files, if Apache's document root #deny access to .htaccess files, if Apache's document root


Loading…
Cancel
Save