Skip to content

Commit

Permalink
Add php_fpm_binary variable (#28)
Browse files Browse the repository at this point in the history
* Update php_fpm_daemon name on Debian

* Add php_fpm_binary variable
  • Loading branch information
combssm authored Oct 26, 2023
1 parent d6f3db2 commit 48e6b54
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Available variables are listed below with their default values (you can also see
| Variable | Description |
| -------- | ----------- |
| php_config_ini_path | Default: `/etc/php.ini`
| php_fpm_binary | Default: `php-fpm`. The name of the binary for the php-fpm service
| php_fpm_config_pool_path | Default: `/etc/php-fpm.d`
| php_fpm_daemon | Default: `php-fpm`
| php_request_slowlog_timeout | Default: `0`
Expand Down
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ php_config_ini_path: /etc/php.ini
php_fpm_config_path: /etc/php-fpm.conf
php_fpm_config_pool_path: /etc/php-fpm.d
php_fpm_daemon: php-fpm
php_fpm_binary: php-fpm
php_fpm_site_errorlog: /home/{{ system_user }}/logs/{{ site_domain | replace(".", "_") }}.php.error.log
php_fpm_slowlog: /var/log/php-fpm/{{ system_user }}-slow.log
php_fpm_socket_path: /var/run/php-fpm/{{ system_user }}.sock
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ driver:
name: docker

platforms:
- name: "molecule-ansible-role-mysql"
- name: "molecule-ansible-role-php_fpm"
image: ${MOLECULE_IMAGE:-geerlingguy/docker-ubuntu2204-ansible:latest}
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
Expand Down
1 change: 1 addition & 0 deletions tasks/facts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- php_version
- php_version_flat
- php_config_ini_path
- php_fpm_binary
- php_fpm_config_path
- php_fpm_daemon
- php_ini_memory_limit
Expand Down
1 change: 1 addition & 0 deletions vars/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ php_config_ini_path: /etc/php/{{ php_version }}/fpm/php.ini
php_fpm_config_path: /etc/php/{{ php_version }}/fpm/php-fpm.conf
php_fpm_config_pool_path: /etc/php/{{ php_version }}/fpm/pool.d
php_fpm_daemon: php{{ php_version }}-fpm
php_fpm_binary: php-fpm{{ php_version }}
php_fpm_site_errorlog: /home/{{ system_user }}/logs/{{ site_domain | replace(".", "_") }}.php.error.log
php_fpm_slowlog: /var/log/php{{ php_version }}-fpm-slow.log
php_fpm_socket_path: /var/run/php/{{ system_user }}.sock
Expand Down

0 comments on commit 48e6b54

Please sign in to comment.