Adding support for PHP session lifetime.

roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml

@@ -291,7 +291,7 @@
     - aws_ec2_autoscale_cluster.deploy_cluster
 
 - name: Gather IAM role info.
-  community.aws.iam_role_info:
+  amazon.aws.iam_role_info:
     profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
     region: "{{ aws_ec2_autoscale_cluster.region }}"
     name: "{{ aws_ec2_autoscale_cluster.iam_role_name }}"

roles/aws/aws_ec2_with_eip/tasks/main.yml

@@ -13,7 +13,7 @@
     _aws_ec2_with_eip_image_latest: "{{ _aws_ec2_with_eip_image.images | sort(attribute='creation_date') | last }}"
 
 - name: Gather IAM role info.
-  community.aws.iam_role_info:
+  amazon.aws.iam_role_info:
     profile: "{{ aws_ec2_with_eip.aws_profile }}"
     region: "{{ aws_ec2_with_eip.region }}"
     name: "{{ aws_ec2_with_eip.iam_role_name }}"

roles/aws/aws_iam_role/tasks/main.yml

@@ -1,5 +1,5 @@
 - name: Create an IAM role.
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     profile: "{{ aws_iam_role.aws_profile }}"
     name: "{{ aws_iam_role.name }}"
     assume_role_policy_document: "{{ lookup('file', aws_iam_role.policy_document + '_document_policy.json') }}"

roles/aws/aws_iam_saml/tasks/main.yml

@@ -23,7 +23,7 @@
   register: _aws_account_info
 
 - name: Create a role for administrative access
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     name: "{{ aws_iam_saml.admin_role }}"
     profile: "{{ aws_iam_saml.aws_profile }}"
     tags: "{{ aws_iam_saml.tags }}"
@@ -37,7 +37,7 @@
     - aws_iam_saml.admin_groups[0] is defined
 
 - name: Create a role for read-only access
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     name: "{{ aws_iam_saml.readonly_role }}"
     profile: "{{ aws_iam_saml.aws_profile }}"
     tags: "{{ aws_iam_saml.tags }}"
@@ -51,7 +51,7 @@
     - aws_iam_saml.readonly_groups[0] is defined
 
 - name: Create a customer managed policy for billing access
-  community.aws.iam_managed_policy:
+  amazon.aws.iam_managed_policy:
     policy_name: "{{ aws_iam_saml.billing_policy }}"
     policy_description: "Custom policy for billing access"
     profile: "{{ aws_iam_saml.aws_profile }}"
@@ -64,7 +64,7 @@
     - aws_iam_saml.billing_groups[0] is defined
 
 - name: Create a role for billing access
-  community.aws.iam_role:
+  amazon.aws.iam_role:
     name: "{{ aws_iam_saml.billing_role }}"
     profile: "{{ aws_iam_saml.aws_profile }}"
     tags: "{{ aws_iam_saml.tags }}"

roles/aws/aws_s3_bucket/tasks/main.yml

@@ -8,7 +8,7 @@
   register: _aws_s3_bucket_bucket
 
 - name: Create a matching policy.
-  community.aws.iam_managed_policy:
+  amazon.aws.iam_managed_policy:
     profile: "{{ aws_s3_bucket.aws_profile }}"
     region: "{{ aws_s3_bucket.region }}"
     policy_name: "{{ aws_s3_bucket.name }}"

roles/debian/php-cli/defaults/main.yml

@@ -20,6 +20,7 @@ php:
     upload_max_filesize: 200M
     max_file_uploads: 20
     date_timezone: "Europe/London"
+    gc_maxlifetime: 1440
     overrides: {}
     opcache:
       enable: 1

roles/debian/php-cli/templates/php.cli.ini.j2

@@ -1384,7 +1384,7 @@ session.gc_divisor = 1000
 ; After this number of seconds, stored data will be seen as 'garbage' and
 ; cleaned up by the garbage collection process.
 ; http://php.net/session.gc-maxlifetime
-session.gc_maxlifetime = 1440
+session.gc_maxlifetime = {{ php.cli.gc_maxlifetime }}
 
 ; NOTE: If you are using the subdirectory option for storing session files
 ;       (see session.save_path above), then garbage collection does *not*

roles/debian/php-fpm/defaults/main.yml

@@ -29,6 +29,7 @@ php:
     max_spare_servers: 3
     process_idle_timeout: 10s
     max_requests: 500
+    gc_maxlifetime: 1440
     opcache:
       enable: 1
       enable_cli: 0

roles/debian/php-fpm/templates/php.fpm.ini.j2

@@ -1384,7 +1384,7 @@ session.gc_divisor = 1000
 ; After this number of seconds, stored data will be seen as 'garbage' and
 ; cleaned up by the garbage collection process.
 ; http://php.net/session.gc-maxlifetime
-session.gc_maxlifetime = 1440
+session.gc_maxlifetime = {{ php.fpm.gc_maxlifetime }}
 
 ; NOTE: If you are using the subdirectory option for storing session files
 ;       (see session.save_path above), then garbage collection does *not*