From 525bd7908382a862c5308570b5b7d51ca8350ff8 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sat, 22 Jan 2022 11:43:20 +0100
Subject: [PATCH] archwiki: Update to PHP8
PHP7 will likely be removed from the repos soon[1]. Time to upgrade! :)
[1] https://archlinux.org/todo/php-7-retiredment/
---
playbooks/wiki.archlinux.org.yml | 2 +-
roles/archwiki/defaults/main.yml | 2 +-
roles/archwiki/handlers/main.yml | 4 ++--
roles/archwiki/tasks/main.yml | 8 ++++----
roles/archwiki/templates/archwiki-prune-cache.service.j2 | 2 +-
roles/archwiki/templates/archwiki-runjobs-wait.service.j2 | 2 +-
roles/archwiki/templates/archwiki-runjobs.service.j2 | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/playbooks/wiki.archlinux.org.yml b/playbooks/wiki.archlinux.org.yml
index 67fd9ed67..03bb8b659 100644
--- a/playbooks/wiki.archlinux.org.yml
+++ b/playbooks/wiki.archlinux.org.yml
@@ -15,7 +15,7 @@
- { role: postfix_null }
- { role: mariadb }
- { role: sudo }
- - { role: php7_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'sockets', 'zip'], zend_extensions: ['opcache'] }
+ - { role: php_fpm, php_extensions: ['bcmath', 'curl', 'gd', 'iconv', 'intl', 'mysqli', 'sockets', 'zip'], zend_extensions: ['opcache'] }
- { role: memcached }
- { role: archwiki }
- { role: fail2ban }
diff --git a/roles/archwiki/defaults/main.yml b/roles/archwiki/defaults/main.yml
index eb33d6f67..c8cc07692 100644
--- a/roles/archwiki/defaults/main.yml
+++ b/roles/archwiki/defaults/main.yml
@@ -7,7 +7,7 @@ archwiki_repository: 'https://github.com/archlinux/archwiki.git'
archwiki_version: '1.37.1-4'
archwiki_question_answer_file: '/srv/http/archwiki/registration-question-answer.txt'
-archwiki_socket: '/run/php-fpm7/archwiki.socket'
+archwiki_socket: '/run/php-fpm/archwiki.socket'
archwiki_memcached_socket: '/run/memcached/archwiki.sock'
archwiki_memcached_memory: 1024
diff --git a/roles/archwiki/handlers/main.yml b/roles/archwiki/handlers/main.yml
index 2f50c14ed..2b0df6797 100644
--- a/roles/archwiki/handlers/main.yml
+++ b/roles/archwiki/handlers/main.yml
@@ -1,7 +1,7 @@
---
-- name: restart php-fpm7@archwiki
- service: name=php-fpm7@{{ archwiki_user }} state=restarted
+- name: restart php-fpm@archwiki
+ service: name=php-fpm@{{ archwiki_user }} state=restarted
- name: run wiki updatescript
command: php {{ archwiki_dir }}/public/maintenance/update.php --quick
diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml
index f928f7024..bac88b38c 100644
--- a/roles/archwiki/tasks/main.yml
+++ b/roles/archwiki/tasks/main.yml
@@ -17,7 +17,7 @@
when: 'archwiki_domain is defined'
- name: install packages
- pacman: name=git,php7-intl state=present
+ pacman: name=git,php-intl state=present
- name: make archwiki user
user: name="{{ archwiki_user }}" shell=/bin/false home="{{ archwiki_dir }}" createhome=no
@@ -79,16 +79,16 @@
- name: configure php-fpm
template:
- src=php-fpm.conf.j2 dest="/etc/php7/php-fpm.d/{{ archwiki_user }}.conf"
+ src=php-fpm.conf.j2 dest="/etc/php/php-fpm.d/{{ archwiki_user }}.conf"
owner=root group=root mode=0644
notify:
- - restart php-fpm7@{{ archwiki_user }}
+ - restart php-fpm@{{ 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-fpm7@{{ archwiki_user }}.socket state=started enabled=true
+ service: name=php-fpm@{{ 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
diff --git a/roles/archwiki/templates/archwiki-prune-cache.service.j2 b/roles/archwiki/templates/archwiki-prune-cache.service.j2
index ab8a924d4..f39dee0f7 100644
--- a/roles/archwiki/templates/archwiki-prune-cache.service.j2
+++ b/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/php7 {{ archwiki_dir }}/public/maintenance/pruneFileCache.php -q --agedays 1
+ExecStart=/usr/bin/php {{ archwiki_dir }}/public/maintenance/pruneFileCache.php -q --agedays 1
NoNewPrivileges=yes
PrivateTmp=yes
diff --git a/roles/archwiki/templates/archwiki-runjobs-wait.service.j2 b/roles/archwiki/templates/archwiki-runjobs-wait.service.j2
index 0e39d86f2..c08afa55c 100644
--- a/roles/archwiki/templates/archwiki-runjobs-wait.service.j2
+++ b/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/php7 {{ archwiki_dir }}/public/maintenance/runJobs.php -q --wait
+ExecStart=/usr/bin/php {{ archwiki_dir }}/public/maintenance/runJobs.php -q --wait
Restart=on-failure
NoNewPrivileges=true
diff --git a/roles/archwiki/templates/archwiki-runjobs.service.j2 b/roles/archwiki/templates/archwiki-runjobs.service.j2
index 33c9dce62..644fa9128 100644
--- a/roles/archwiki/templates/archwiki-runjobs.service.j2
+++ b/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/php7 {{ archwiki_dir }}/public/maintenance/runJobs.php -q
+ExecStart=/usr/bin/php {{ archwiki_dir }}/public/maintenance/runJobs.php -q
NoNewPrivileges=true
ProtectHome=true
--
GitLab