diff --git a/defaults/main.yml b/defaults/main.yml index 76700ac..57d4d2f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,10 +3,6 @@ php_fpm_log_dir: /var/log/phpfpm php_fpm_pool_dir: "/etc/php/{{ php_version.stdout }}/fpm/pool.d" php_fpm_pool_config_file: "{{ php_fpm_pool_dir }}/%i.cfg" -php_fpm_cpu_quota: "100%" -php_fpm_memory_high: "25%" -php_fpm_memory_max: "35%" - apache_php_module_name: "libapache2-mod-php{{ php_version.stdout }}" php_fpm_config: diff --git a/tasks/php.yml b/tasks/php.yml index 5217f8b..6a18230 100644 --- a/tasks/php.yml +++ b/tasks/php.yml @@ -21,7 +21,7 @@ - name: "PHP | Copy template for PHP-FPM systemd service and socket" ansible.builtin.template: - src: "systemd/{{ item }}" + src: "systemd/{{ item }}.j2" dest: "/etc/systemd/system/{{ item }}" mode: "0644" loop: diff --git a/tasks/user.yml b/tasks/user.yml index 81c727e..94b026f 100644 --- a/tasks/user.yml +++ b/tasks/user.yml @@ -24,7 +24,7 @@ # Don't override local changes - name: "User | Create PHP-FPM pool" ansible.builtin.template: - src: fpmpool.cfg + src: fpmpool.cfg.j2 dest: "/etc/php/{{ php_version.stdout }}/fpm/pool.d/{{ php_user }}.cfg" force: false mode: "0644" diff --git a/templates/fpmpool.cfg b/templates/fpmpool.cfg.j2 similarity index 100% rename from templates/fpmpool.cfg rename to templates/fpmpool.cfg.j2 diff --git a/templates/systemd/php-fpm@.service b/templates/systemd/php-fpm@.service.j2 similarity index 90% rename from templates/systemd/php-fpm@.service rename to templates/systemd/php-fpm@.service.j2 index 08658b5..d080bb5 100644 --- a/templates/systemd/php-fpm@.service +++ b/templates/systemd/php-fpm@.service.j2 @@ -41,9 +41,15 @@ SystemCallErrorNumber=EPERM SystemCallFilter=@system-service # Resources +{% if php_fpm_cpu_quota is defined %} CPUQuota={{ php_fpm_cpu_quota }} +{% endif %} +{% if php_fpm_memory_high is defined %} MemoryHigh={{ php_fpm_memory_high }} +{% endif %} +{% if php_fpm_memory_max is defined %} MemoryMax={{ php_fpm_memory_max }} +{% endif %} [Install] WantedBy=multi-user.target diff --git a/templates/systemd/php-fpm@.socket b/templates/systemd/php-fpm@.socket.j2 similarity index 100% rename from templates/systemd/php-fpm@.socket rename to templates/systemd/php-fpm@.socket.j2