diff --git a/roles/_exit/tasks/main.yml b/roles/_exit/tasks/main.yml index 6d9e35072..64917f838 100644 --- a/roles/_exit/tasks/main.yml +++ b/roles/_exit/tasks/main.yml @@ -49,24 +49,24 @@ become: true when: inventory_hostname != "localhost" -- name: Make sure path exist. - ansible.builtin.file: - path: "/home/controller/build/clients/{{ _aws_profile }}" - recurse: true - state: directory - mode: 0644 - become: true - delegate_to: localhost - -- name: Copy server details into clients folder. - ansible.builtin.template: - src: server_details.j2 - dest: "/home/controller/build/clients/{{ _aws_profile }}/{{ _aws_resource_name }}" - mode: "0755" - owner: controller - group: controller - become: true - delegate_to: localhost +#- name: Make sure path exist. +# ansible.builtin.file: +# path: "/home/controller/build/clients/{{ _aws_profile }}" +# recurse: true +# state: directory +# mode: 0644 +# become: true +# delegate_to: localhost +# +#- name: Copy server details into clients folder. +# ansible.builtin.template: +# src: server_details.j2 +# dest: "/home/controller/build/clients/{{ _aws_profile }}/{{ _aws_resource_name }}" +# mode: "0755" +# owner: controller +# group: controller +# become: true +# delegate_to: localhost - name: Delete the lock file. ansible.builtin.file: diff --git a/roles/aws/aws_backup/tasks/resource.yml b/roles/aws/aws_backup/tasks/resource.yml index a132a3c32..5343fca11 100644 --- a/roles/aws/aws_backup/tasks/resource.yml +++ b/roles/aws/aws_backup/tasks/resource.yml @@ -65,7 +65,7 @@ aws backup create-backup-selection --backup-plan-id {{ _backup_plan_info.stdout | from_json | json_query('BackupPlanId') }} --backup-selection "{\"SelectionName\":\"{{ backup.selection_name }}\",\"IamRoleArn\":\"{{ _iam_role_arn }}\",\"Resources\":[\"{{ _resource_arn }}\"]}" --region {{ _aws_region }} when: _selection_exists.stdout | length == 0 -#- name: Create restore testing plan. -# ansible.builtin.include_role: -# name: aws/aws_backup_validation -# tasks_from: testing_resources +- name: Create restore testing plan. + ansible.builtin.include_role: + name: aws/aws_backup_validation + tasks_from: testing_resources diff --git a/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 b/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 index c87d560e0..1cb7e06f7 100644 --- a/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 +++ b/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 @@ -8,7 +8,7 @@ "ProtectedResourceType": "{{ _instance_type_restore }}", "RestoreMetadataOverrides": { "vpcSecurityGroupIds": "[\"{{ _restore_testing_sg.group_id }}\"]", - "dbsubnetgroupname": "{{ _aws_rds_rds_subnet_group.name }}" + "dbsubnetgroupname": "{{ aws_rds.name }}" }, "RestoreTestingSelectionName": "{{ backup.selection_name | replace("-", "_") }}", "ValidationWindowHours": 1 diff --git a/roles/debian/php-fpm/README.md b/roles/debian/php-fpm/README.md index 94a687ac4..1c6484680 100644 --- a/roles/debian/php-fpm/README.md +++ b/roles/debian/php-fpm/README.md @@ -20,7 +20,10 @@ php: pool_group: "{{ user_deploy.username }}" # if using unix socket this should be the web server user pm: dynamic # can also be static, see https://tideways.com/profiler/blog/an-introduction-to-php-fpm-tuning default_socket_timeout: 60 - max_children: 5 + # It is important to scale up processes on bigger servers, so that more + # requests can be handled. Double the number of vCPUs is a good default. + # Can be between 5 and 64. + max_children: "{{ [5, [ansible_facts.processor_vcpus * 2, 64] | min] | max }}" start_servers: 2 min_spare_servers: 1 max_spare_servers: 3