Merge branch 'wiki_php7' into 'master'

Switch the archwiki to PHP 7

See merge request !308

playbooks/wiki.archlinux.org.yml

@@ -14,7 +14,7 @@
     - { role: postfix, postfix_relayhost: "mail.archlinux.org" }
     - { role: mariadb, mariadb_query_cache_type: '0', mariadb_innodb_file_per_table: true }
     - { role: sudo }
-    - { role: php_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'sockets', 'zip'], zend_extensions: ['opcache'] }
+    - { role: php7_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'sockets', 'zip'], zend_extensions: ['opcache'] }
     - { role: memcached }
     - { role: archwiki }
     - { role: fail2ban }

roles/archwiki/defaults/main.yml

@@ -7,7 +7,7 @@ archwiki_repository: 'https://github.com/archlinux/archwiki.git'
 archwiki_version: '1.35.0-1'
 archwiki_question_answer_file: '/srv/http/archwiki/registration-question-answer.txt'
 
-archwiki_socket: '/run/php-fpm/archwiki.socket'
+archwiki_socket: '/run/php-fpm7/archwiki.socket'
 archwiki_memcached_socket: '/run/memcached/archwiki.sock'
 archwiki_memcached_memory: 2048
 

roles/archwiki/handlers/main.yml

 ---
 
-- name: restart php-fpm@archwiki
-  service: name=php-fpm@{{ archwiki_user }} state=restarted
+- name: restart php-fpm7@archwiki
+  service: name=php-fpm7@{{ archwiki_user }} state=restarted
 
 - name: run wiki updatescript
   command: php {{ archwiki_dir }}/public/maintenance/update.php --quick

roles/archwiki/tasks/main.yml

@@ -17,7 +17,7 @@
   when: 'archwiki_domain is defined'
 
 - name: install packages
-  pacman: name=git,php-intl state=present
+  pacman: name=git,php7-intl state=present
 
 - name: make archwiki user
   user: name="{{ archwiki_user }}" shell=/bin/false home="{{ archwiki_dir }}" createhome=no
@@ -80,16 +80,16 @@
 
 - name: configure php-fpm
   template:
-    src=php-fpm.conf.j2 dest="/etc/php/php-fpm.d/{{ archwiki_user }}.conf"
+    src=php-fpm.conf.j2 dest="/etc/php7/php-fpm.d/{{ archwiki_user }}.conf"
     owner=root group=root mode=0644
   notify:
-    - restart php-fpm@{{ archwiki_user }}
+    - restart php-fpm7@{{ archwiki_user }}
 
 - name: install archwiki memcached service
   template: src="archwiki-memcached.service.j2" dest="/etc/systemd/system/archwiki-memcached.service" owner=root group=root mode=0644
 
 - name: start and enable systemd socket
-  service: name=php-fpm@{{ archwiki_user }}.socket state=started enabled=true
+  service: name=php-fpm7@{{ archwiki_user }}.socket state=started enabled=true
 
 - name: install systemd services/timers
   template: src="{{ item }}.j2" dest="/etc/systemd/system/{{ item }}" owner=root group=root mode=0644

roles/archwiki/templates/archwiki-prune-cache.service.j2

@@ -5,7 +5,7 @@ Description=Archwiki Prune Cache Service
 Type=oneshot
 User={{ archwiki_user }}
 WorkingDirectory={{ archwiki_dir }}
-ExecStart=/usr/bin/php {{ archwiki_dir }}/public/maintenance/pruneFileCache.php -q --agedays 1
+ExecStart=/usr/bin/php7 {{ archwiki_dir }}/public/maintenance/pruneFileCache.php -q --agedays 1
 
 NoNewPrivileges=yes
 PrivateTmp=yes

roles/archwiki/templates/archwiki-runjobs-wait.service.j2

@@ -5,7 +5,7 @@ After=mysqld.service
 [Service]
 User={{ archwiki_user }}
 WorkingDirectory={{ archwiki_dir }}
-ExecStart=/usr/bin/php {{ archwiki_dir }}/public/maintenance/runJobs.php -q --wait
+ExecStart=/usr/bin/php7 {{ archwiki_dir }}/public/maintenance/runJobs.php -q --wait
 Restart=on-failure
 
 NoNewPrivileges=true

roles/archwiki/templates/archwiki-runjobs.service.j2

@@ -5,7 +5,7 @@ Description=Archwiki runJobs Service
 Type=oneshot
 User={{ archwiki_user }}
 WorkingDirectory={{ archwiki_dir }}
-ExecStart=/usr/bin/php {{ archwiki_dir }}/public/maintenance/runJobs.php -q
+ExecStart=/usr/bin/php7 {{ archwiki_dir }}/public/maintenance/runJobs.php -q
 
 NoNewPrivileges=true
 ProtectHome=true