Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.

Commit a92733d

Browse files
drazenCEmatej5Matej Stajduhargregharveyklausi
authored
Updating pam ldap condition pr devel 2.x (#2696)
* Fixing-email-title-for-backup-validation (#2657) Co-authored-by: Matej Stajduhar <[email protected]> * Adding-task-to-create-aurora-cluster (#2659) * Adding-task-to-create-aurora-cluster * Adding-region-profile-and-tags-to-aurora-cluster * Updating-engine-for-aurora-cluster * Updating-parameter-group-engine * Updating-engine-version * Updating-engine-version-2 * Disabling-automated-backups * Disabling-automated-backups-2 * Disabling-automated-backups-3 * Disabling-automated-backups-4 * Skipping-task-if-not-aurora * Adding-subnet-group-to-instances * Adding-subnet-group-to-instances * Updating-SG-return-values * Updating-SG-return-values-2 * Updating-SG-return-values-3 * Updating-SG-return-values-4 * Updating-SG-return-value-debug * Updating-SG-return-value-debug-2 * Updating-SG-return-value-debug-3 * Removing-debug-tasks * Removing-init-var-for-SG-list * Adding-character-set-option --------- Co-authored-by: Matej Stajduhar <[email protected]> * Fixing truthy variable mistakes. (#2662) * Fixing installer variable bug. * Fixing tests for external PRs. * Testing with a fork. * Adding repo owner's username into installer string. * Refactoring config repo detection to simplify. * No longer permitted to use an integer as a truthy value. * No longer permitted to use existence check as a truthy value. * Can't see a reason why linotp var shouldn't be a boolean. * No longer permitted to use existence check as a truthy value. * Fixing truthy errors in ce_deploy role. * No longer permitted to use an integer as a truthy value. * feat(php): Add FPM slow logrotate (#2625) * feat(php): Support removal of APCU, add FPM slow logrotate * simplify condition * revert apcu installed setting, not needed * r73458-install-php-gmp-by-default2 (#2667) * r73458-install-php-gmp-by-default2 * re-add required packages * Wazuh-mitre-report-setup (#2588) * Wazuh-mitre-report-setup * Wazuh-mitre-shellshock-longurl-block * Fixing-vars * Wazuh-mitre-report-setup-PR-2.x * Wazuh mitre report setup pr 2.x (#2669) * Wazuh-mitre-report-setup * Wazuh-mitre-shellshock-longurl-block * Fixing-vars * Wazuh-mitre-report-setup-PR-2.x * Wazuh-mitre-report-setup-PR-2.x * pin_ansible_version (#2671) * pin_ansible_version * pin_ansible_version * pin_ansible_version * pin_ansible_version * pin_ansible_version_fix_upgrade_timer * pin_ansible_version_fix_upgrade_timer * pin_ansible_version_fix_upgrade_timer * pin_ansible_version_disable_upgrade_timer * pin_ansible_version_disable_upgrade_timer * pin_ansible_version_disable_upgrade_timer * pin_ansible_version_disable_upgrade_timer * Fixing-ce-provision-vars (#2678) * Updating-string (#2507) * Updating-string * Updating-string-3 --------- Co-authored-by: Matej Stajduhar <[email protected]> * Added-tasks-to-backup-Aurora-and-copy-AMI-to-safe-region (#2682) * Added-tasks-to-backup-Aurora-and-copy-AMI-to-safe-region * Fixing-aurora-backup-tasks * Fixing-aurora-backup-tasks-2 * Fixing-aurora-backup-tasks-3 * Fixing-aurora-backup-tasks-5 * Adding-aurora-template * Updating-aurora-vars * Adding-handler-to-defaults-for-CF --------- Co-authored-by: Matej Stajduhar <[email protected]> * SG-creation-update (#2605) * SG-creation-update * Updating-lambda-tasks-to-handle-various-file-options * Updating-lambda-tasks-for-url-handling * Updating-aws_admin_tools-for-aws_lambda * Updating-aws_admin_tools-for-aws_lambda * Setting-loop-item * Setting-loop-item-2 * Updating-vpc-sec-group-vars * Removing-extra-vars-for-git-module * Adding-default-for-git_url * Cleaning-up-tasks * Updating-ansible-lint * Updating-ansible-lint * Ommiting-name-if-no-sec_group-name-defined * Removing-loop-var --------- Co-authored-by: Matej Stajduhar <[email protected]> * Fixing-copy-AMI-to-backup-region (#2684) Co-authored-by: Matej Stajduhar <[email protected]> * Fixing-ami-copy-task (#2686) Co-authored-by: Matej Stajduhar <[email protected]> * Bug fixes pr 2.x (#2690) * Fixing installer variable bug. * Fixing tests for external PRs. * Testing with a fork. * Adding repo owner's username into installer string. * Refactoring config repo detection to simplify. * No longer permitted to use an integer as a truthy value. * No longer permitted to use existence check as a truthy value. * Can't see a reason why linotp var shouldn't be a boolean. * No longer permitted to use existence check as a truthy value. * Fixing truthy errors in ce_deploy role. * No longer permitted to use an integer as a truthy value. * Updating clamav command to use flock avoiding duplicate processes running. * 73569 allowing webp nginx pr 2.x (#2692) * allowing webp extension * adding webp mime type --------- Co-authored-by: filip <[email protected]> * Updating-pam-ldap-condition * Updating-pam-ldap-condition-PR-devel-2.x --------- Co-authored-by: Matej Štajduhar <[email protected]> Co-authored-by: Matej Stajduhar <[email protected]> Co-authored-by: Greg Harvey <[email protected]> Co-authored-by: Klaus Purer <[email protected]> Co-authored-by: nfawbert <[email protected]> Co-authored-by: tymofiisobchenko <[email protected]> Co-authored-by: Filip Rupic <[email protected]> Co-authored-by: filip <[email protected]>
1 parent 91523bd commit a92733d

File tree

2 files changed

+12
-24
lines changed

2 files changed

+12
-24
lines changed

roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
name: aws/aws_vpc
3535
tasks_from: security_group
3636
vars:
37-
aws_vpc:
37+
aws_vpc_sg:
3838
name: "{{ aws_ec2_autoscale_cluster.name }}"
3939
profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
4040
region: "{{ aws_ec2_autoscale_cluster.region }}"
@@ -45,29 +45,10 @@
4545
rules:
4646
- proto: all
4747
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
48-
ansible.builtin.include_role:
49-
name: aws/aws_vpc
50-
tasks_from: security_group
51-
vars:
52-
aws_vpc:
53-
name: "{{ aws_ec2_autoscale_cluster.name }}"
54-
profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
55-
region: "{{ aws_ec2_autoscale_cluster.region }}"
56-
tags: "{{ aws_ec2_autoscale_cluster.tags | combine({'Name': aws_ec2_autoscale_cluster.name}) }}"
57-
state: "{{ aws_ec2_autoscale_cluster.state }}"
58-
id: "{{ _aws_ec2_autoscale_cluster_vpc_id }}"
59-
description: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
60-
rules:
48+
rules_egress:
6149
- proto: all
6250
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
63-
rules_egress:
64-
- proto: all
65-
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
66-
rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
67-
68-
- name: Set _aws_ec2_autoscale_cluster_security_group variable.
69-
ansible.builtin.set_fact:
70-
_aws_ec2_autoscale_cluster_security_group: "{{ aws_vpc._result[aws_ec2_autoscale_cluster.name] }}"
51+
rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
7152

7253
- name: Set _aws_ec2_autoscale_cluster_security_group variable.
7354
ansible.builtin.set_fact:
@@ -797,3 +778,10 @@
797778
when:
798779
- aws_ec2_autoscale_cluster.route_53.zone is defined
799780
- aws_ec2_autoscale_cluster.route_53.zone | length > 0
781+
782+
#- name: Copy AMI to backup region.
783+
# community.aws.ec2_ami_copy:
784+
# aws_profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
785+
# source_region: "{{ aws_ec2_autoscale_cluster.region }}"
786+
# region: "{{ aws_backup.copy_vault.region }}"
787+
# source_image_id: "{{ aws_ec2_autoscale_cluster_image_latest.image_id }}"

roles/debian/pam_ldap/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
ansible.builtin.file:
1515
path: /etc/ldap/ssl
1616
state: directory
17-
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
17+
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
1818

1919
- name: Copy certificate.
2020
ansible.builtin.copy:
2121
src: "{{ pam_ldap.ssl_certificate }}"
2222
dest: "/etc/ldap/ssl/{{ pam_ldap.ssl_certificate | basename }}"
2323
mode: "0666"
24-
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
24+
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0
2525

2626
- name: Copy nslcd config.
2727
ansible.builtin.template:

0 commit comments

Comments
 (0)