Skip to content

K2GO-386 fix(rootfs): stop php-fpm running idle by default (barrier 1) #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luisguzman-adfa merged 1 commit into from
Sep 5, 2026
+47 −0
Merged

K2GO-386 fix(rootfs): stop php-fpm running idle by default (barrier 1) #543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions tools/upstream-patches/patches/0002-php-fpm-role-ownership.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Upstream-PR: WIP — to be presented to IIAB upstream
Upstream-Status: open
Applies-to: roles/nginx/tasks/install.yml, roles/matomo/tasks/install.yml
Summary: Move php-fpm ownership from nginx to the roles that use it — nginx no longer manages php-fpm (both proot and non-proot), Matomo enables its own. Stops idle php-fpm running by default (K2GO-386). Carried for our build; WIP for upstream (pairs with every php role self-managing).

diff --git a/roles/matomo/tasks/install.yml b/roles/matomo/tasks/install.yml
index 65bf441..eceddd1 100644
--- a/roles/matomo/tasks/install.yml
+++ b/roles/matomo/tasks/install.yml
@@ -47,6 +47,10 @@
include_tasks: roles/www_options/tasks/php-settings.yml
when: php_settings_done is undefined

+- name: Enable 'php-fpm' via pdsm (proot) so Matomo owns its php-fpm (do not rely on the nginx role)
+ command: pdsm enable php-fpm
+ when: is_proot
+
- name: Start 'php-fpm' via pdsm (proot)
command: pdsm start php-fpm
register: pdsm_start
diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index 2d24a48..4b9ad3a 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -64,22 +64,6 @@
msg: roles/nginx/tasks/homepage.yml will run LATER (invoked by roles/www_options/tasks/main.yml) SO THAT NGINX CAN REDIRECT http://box TO http://box{{ iiab_home_url }} (based on var iiab_home_url)
# - include_tasks: roles/nginx/tasks/homepage.yml

-- name: Restart php{{ php_version }}-fpm systemd service
- systemd:
- name: "php{{ php_version }}-fpm"
- state: restarted
- when: not is_proot
-
-- name: Enable & Restart recently installed 'php-fpm' via pdsm (proot)
- when: is_proot
- block:
- - name: Enable 'php-fpm' via pdsm (proot)
- command: pdsm enable php-fpm
-
- - name: Restart 'php-fpm' via pdsm (proot)
- command: pdsm restart php-fpm
-
-
# RECORD NGINX AS INSTALLED

- name: Record (final) disk space used
Loading