diff --git a/roles/debian/php-cli/README.md b/roles/debian/php-cli/README.md index d8a9c8636..aff0d33ab 100644 --- a/roles/debian/php-cli/README.md +++ b/roles/debian/php-cli/README.md @@ -39,6 +39,7 @@ php: memory_consumption: 128 max_accelerated_files: 2000 validate_timestamps: 1 + interned_strings_buffer: 8 ``` diff --git a/roles/debian/php-cli/defaults/main.yml b/roles/debian/php-cli/defaults/main.yml index 797be3626..e71951b5a 100644 --- a/roles/debian/php-cli/defaults/main.yml +++ b/roles/debian/php-cli/defaults/main.yml @@ -29,3 +29,4 @@ php: memory_consumption: 128 max_accelerated_files: 2000 validate_timestamps: 1 + interned_strings_buffer: 8 diff --git a/roles/debian/php-cli/templates/php.cli.ini.j2 b/roles/debian/php-cli/templates/php.cli.ini.j2 index 19230f2c4..e45952c56 100644 --- a/roles/debian/php-cli/templates/php.cli.ini.j2 +++ b/roles/debian/php-cli/templates/php.cli.ini.j2 @@ -1739,7 +1739,7 @@ opcache.enable_cli={{ php.cli.opcache.enable_cli }} opcache.memory_consumption={{ php.cli.opcache.memory_consumption }} ; The amount of memory for interned strings in Mbytes. -;opcache.interned_strings_buffer=4 +opcache.interned_strings_buffer={{ php.cli.opcache.interned_strings_buffer }} ; The maximum number of keys (scripts) in the OPcache hash table. ; Only numbers between 200 and 100000 are allowed. diff --git a/roles/debian/php-fpm/README.md b/roles/debian/php-fpm/README.md index 443ffbf87..ea0df8f5a 100644 --- a/roles/debian/php-fpm/README.md +++ b/roles/debian/php-fpm/README.md @@ -64,6 +64,7 @@ php: memory_consumption: 128 max_accelerated_files: 2000 validate_timestamps: 1 + interned_strings_buffer: 8 clear_env: "yes" ``` diff --git a/roles/debian/php-fpm/defaults/main.yml b/roles/debian/php-fpm/defaults/main.yml index 7e73d8221..7aec91483 100644 --- a/roles/debian/php-fpm/defaults/main.yml +++ b/roles/debian/php-fpm/defaults/main.yml @@ -54,6 +54,7 @@ php: memory_consumption: 128 max_accelerated_files: 2000 validate_timestamps: 1 + interned_strings_buffer: 8 clear_env: "yes" # Cloudwatch log settings. log_group_prefix: "" diff --git a/roles/debian/php-fpm/templates/php.fpm.ini.j2 b/roles/debian/php-fpm/templates/php.fpm.ini.j2 index c6a1a0361..c1ef51fcf 100644 --- a/roles/debian/php-fpm/templates/php.fpm.ini.j2 +++ b/roles/debian/php-fpm/templates/php.fpm.ini.j2 @@ -1739,7 +1739,7 @@ opcache.enable_cli={{ php.fpm.opcache.enable_cli }} opcache.memory_consumption={{ php.fpm.opcache.memory_consumption }} ; The amount of memory for interned strings in Mbytes. -;opcache.interned_strings_buffer=4 +opcache.interned_strings_buffer={{ php.fpm.opcache.interned_strings_buffer }} ; The maximum number of keys (scripts) in the OPcache hash table. ; Only numbers between 200 and 100000 are allowed. diff --git a/roles/debian/sudo_config/tasks/main.yml b/roles/debian/sudo_config/tasks/main.yml index ba52dab64..7136eddbd 100644 --- a/roles/debian/sudo_config/tasks/main.yml +++ b/roles/debian/sudo_config/tasks/main.yml @@ -5,14 +5,14 @@ state: directory mode: "0750" -- name: Create temporary directory for sudoers validation +- name: Create temporary directory for sudoers validation. ansible.builtin.tempfile: state: directory suffix: sudoers register: temp_sudoers_dir when: sudo_config | default([]) | length > 0 -- name: Create sudoers file for validation +- name: Create sudoers file for validation. ansible.builtin.template: src: "sudoer.j2" dest: "{{ temp_sudoers_dir.path }}/{{ item.filename }}" @@ -23,7 +23,7 @@ with_items: "{{ sudo_config if sudo_config is iterable and sudo_config is not mapping else [sudo_config] }}" register: sudo_templates -- name: Validate sudoers file on remote +- name: Validate sudoers file on remote. ansible.builtin.command: "visudo -cf {{ temp_sudoers_dir.path }}/{{ item.filename }}" register: visudo_check failed_when: visudo_check.rc != 0 @@ -34,7 +34,7 @@ label: "{{ item.filename }}" delegate_to: "{{ inventory_hostname }}" -- name: Install validated sudoers file +- name: Install validated sudoers file. ansible.builtin.copy: src: "{{ temp_sudoers_dir.path }}/{{ item.filename }}" dest: "/etc/sudoers.d/{{ item.filename }}" @@ -45,7 +45,7 @@ when: item.entity_name | default('') | length > 0 with_items: "{{ sudo_config if sudo_config is iterable and sudo_config is not mapping else [sudo_config] }}" -- name: Clean up temporary files +- name: Clean up temporary files. ansible.builtin.file: path: "{{ temp_sudoers_dir.path }}" state: absent