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

Updating-pam-ldap-condition #2695

Merged
merged 2 commits into from
Sep 24, 2025
Merged

Updating-pam-ldap-condition #2695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4e8d45
Updating-pam-ldap-condition
drazenCE Sep 24, 2025
c066240
Updating-pam-ldap-condition-PR-2.x
drazenCE Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
name: aws/aws_vpc
tasks_from: security_group
vars:
aws_vpc:
aws_vpc_sg:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks to me like something has gone wrong with merge conflict resolution? I don't think these changes should be showing up in this branch.

name: "{{ aws_ec2_autoscale_cluster.name }}"
profile: "{{ aws_ec2_autoscale_cluster.aws_profile }}"
region: "{{ aws_ec2_autoscale_cluster.region }}"
Expand All @@ -45,10 +45,10 @@
rules:
- proto: all
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
rules_egress:
- proto: all
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"
rules_egress:
- proto: all
group_name: "{{ aws_ec2_autoscale_cluster.name }}"
rule_desc: "Allow internal traffic for cluster {{ aws_ec2_autoscale_cluster.name }}"

- name: Set _aws_ec2_autoscale_cluster_security_group variable.
ansible.builtin.set_fact:
Expand Down
4 changes: 2 additions & 2 deletions roles/debian/pam_ldap/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
ansible.builtin.file:
path: /etc/ldap/ssl
state: directory
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0

- name: Copy certificate.
ansible.builtin.copy:
src: "{{ pam_ldap.ssl_certificate }}"
dest: "/etc/ldap/ssl/{{ pam_ldap.ssl_certificate | basename }}"
mode: "0666"
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate
when: pam_ldap.ssl_certificate is defined and pam_ldap.ssl_certificate | length > 0

- name: Copy nslcd config.
ansible.builtin.template:
Expand Down
Loading