From cbb2c942d679d155b00a1b5deb940c4ad3d671a1 Mon Sep 17 00:00:00 2001 From: Alex Dworjan Date: Wed, 11 Oct 2023 10:54:26 -0400 Subject: [PATCH] corrected conditionals --- .ansible-sign/sha256sum.txt | 2 +- .ansible-sign/sha256sum.txt.sig | 22 ++++++++++---------- Web Install and Verification collections.yml | 8 +++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.ansible-sign/sha256sum.txt b/.ansible-sign/sha256sum.txt index 08af5a4..ac281cd 100644 --- a/.ansible-sign/sha256sum.txt +++ b/.ansible-sign/sha256sum.txt @@ -5,7 +5,7 @@ 70a02b2ea67010225862e96e234b1083f3be361bffbc05a08c5c31ffe1aad111 Gitea New Release.yml fb9c7ac18fb9854d858e4fc2fa5808e85136e511ddd8e2c910ae5890fdebb906 MANIFEST.in 6974a0aa1b9c3b22e8787892b21ff594f5c961a6db12788f2ade12481dd4ce63 README.md -e2f96ea8ad5b2aff7ec00bb7afb48a36e3c3bd6fb472270a09d501b84e38a1d1 Web Install and Verification collections.yml +96a64d0f5200fd8174208e05923c74e4bce8553a7e8c58022c6853c72dd87b2e Web Install and Verification collections.yml 4f5ced27a9586ad0fa01a7f3a1e52c3fe3dc7168a4f6ffb92f269207594b8eb3 Web Verification collections.yml ce9c52cf73a341ec2c18de2156f1dcd0f3e1b543109a79c993cfad9429426c2c collections/requirements.yml 28f58dfdc64124ad4468d9a0ec0b48e5a0f618f2eb018f6be5f35d5b51032666 roles/.DS_Store diff --git a/.ansible-sign/sha256sum.txt.sig b/.ansible-sign/sha256sum.txt.sig index cc8896e..eece4bd 100644 --- a/.ansible-sign/sha256sum.txt.sig +++ b/.ansible-sign/sha256sum.txt.sig @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNATURE----- -iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmUmtgoACgkQTiIiIXrU -DNGYiQv/YoHBe7eJMIHBxfGyIQ0gQJzs2OjGPPSefSlPN4gbM4dhviW9McgAxw8I -LJVzqKKOGwTMwUCJ3q4FO4Z2Yn1cHY4c94BRUt3kBnTiJo8mYHQ4+mcw4XBchxF1 -689TOP+WIHlu2MR7AWv6T9BPKITsXhf4WmtKdQ/8yYm0nyidBDkDpdjPqxCTj+3l -Gn1SV6xX7zrjf0X3SH8MNFDobVzlEUn9RuF7QorYBSBz1C/fn0JMLRdF5j9vH/aE -YQSQdwvjilMjwsK5qbnnmMXBpHjVUE0+sFJCYG+bkuKl16XXQlDs+6g/9Ja6JwRw -U9tUZ6BX8oxU+DAN5phcUVnVZNA0Y5qmckUrCI5heXOI/O7CNOAV3dnuO1UKQjUc -MrHBmulAVPI2L6wBC78AQmC5nHM/1iSsaGk9fF0hpA+0a7Hiuad4v5aXJc/PgGQ4 -Kj26wBAdV+6cIsCFaPuHGiuC70CXyA+jrPyaJM3TwyDvjkOA+BtjFz4cKFc34v9C -GXf9VfCW -=AjZH +iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmUmtwoACgkQTiIiIXrU +DNHPTgv/Rru0Gyi4Vo20ocyyRPaBuMo2m81LPTALwjqJCEMFDdybplRXtWEYHzOk +7SVs8kdXBtDoEPqyC+9i0ky1nF3Ey3TpRCE94feS4DofK1qGVujdt32O5cqMNh32 +S2yOKDHzdCef64gvNj8IzmJwguIPUKwHhn1SuqOzALR+KH4gnD3nVR8R80AZuITA +qSWPEo3QsajFExpULMziryqSXJ8MdHf7MnE352CBG81IQQ7ju/ugbH1f78l4WBY5 +AiozpOKtsJISAUPOdZRJETVRNQevSxvlKic3P4E8CRZZAArbNvVuOfvGHkc+JuN7 +OIidVkusyEUuW71W7+wN9M96kcH2QO5yGbsprNGMPGkkUxFZsOHBpdnlbmPfP3pA +37s4BmdJCEOLuIBB/sP8LULs7nUIi472NsGyBhzVEZRg2VHdp+T74MvFTCAdCdrj +COYM24X0b5VEn0vtwjbZAntAv0Bg8LRXR3Gf/1gJh3xWqxPEBHo1xRYRsc4Lz4x7 +MFAbyq2N +=c47P -----END PGP SIGNATURE----- diff --git a/Web Install and Verification collections.yml b/Web Install and Verification collections.yml index cd4e54c..37aeb66 100644 --- a/Web Install and Verification collections.yml +++ b/Web Install and Verification collections.yml @@ -7,14 +7,14 @@ - name: RHEL Apache config ansible.builtin.include_role: name: webservers_collection - when: os is match("rhel.*") + when: os is match("rhel.*") or os == "Red Hat Enterprise Linux" tags: - always - name: Windows IIS config ansible.builtin.include_role: name: webservers_collection - when: os is match("windows.*") or os == "2016-Datacenter" + when: os is match("windows.*") or os is match("2016.*") or os == "Windows" tags: - always @@ -26,7 +26,7 @@ return_content: true register: this failed_when: "inventory_hostname not in this.content" - when: os is match("rhel.*") + when: os is match("rhel.*") or os == "Red Hat Enterprise Linux" tags: - updaterhel @@ -37,7 +37,7 @@ return_content: true register: this failed_when: "inventory_hostname not in this.content" - when: os is match("windows.*") or os is match("2016.*") + when: os is match("windows.*") or os is match("2016.*") or os == "Windows" tags: - updatewin