From b49eaaf782d2c51c442a10da6b4ad05b399980a3 Mon Sep 17 00:00:00 2001 From: Alex Dworjan Date: Wed, 11 Oct 2023 10:50:00 -0400 Subject: [PATCH] fix conditional for website --- .ansible-sign/sha256sum.txt | 2 +- .ansible-sign/sha256sum.txt.sig | 22 +++++++++++----------- roles/webservers_collection/tasks/main.yml | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.ansible-sign/sha256sum.txt b/.ansible-sign/sha256sum.txt index a734420..08af5a4 100644 --- a/.ansible-sign/sha256sum.txt +++ b/.ansible-sign/sha256sum.txt @@ -15,7 +15,7 @@ e98a705a7d6ef5c6f50c1f36ea2029ccc4f56ba0260d7ac448ff841cb8c28527 roles/deploy_n 41bcaa7dd13ca34f7d453c2b76855b5fb0c87bb953e0c4cf2d9f39e7d31b4a74 roles/verification_collection/tasks/rhel_verification.yml 7f41bee96b50ef64093d22728df75dd12c1d5d3f68783581f3926b8be4605cd9 roles/verification_collection/tasks/windows_verification.yml 8322884d79e1151e312fc788d1f955d35f6d3f1094ee4255a1a83391367c34db roles/webservers_collection/handlers/main.yml -20534ff8ecd01c1466087909e8dafd934c95a1d9e327e4a7c3acd07311a8b640 roles/webservers_collection/tasks/main.yml +30f4eceed3a1db94a91f880580d8a185486638946da4d1724fdabe98f2409c8d roles/webservers_collection/tasks/main.yml 81a3178ed16f2d0d8010d06ef55adff52914f6b9b571928185861e5931b04d45 roles/webservers_collection/tasks/rhel_apache_collections.yml 810a0d815a8049d79c230fdb61de11c9c0ab7eee33f62fc9a0f691e9f3ed73fe roles/webservers_collection/tasks/windows_iis_collections.yml 12ac05b79566c7ef6ae34c2692970f3af53c6de63856b59c0e1e7f63509c4690 roles/webservers_collection/templates/indexcomplex.html.j2 diff --git a/.ansible-sign/sha256sum.txt.sig b/.ansible-sign/sha256sum.txt.sig index ba49b00..cc8896e 100644 --- a/.ansible-sign/sha256sum.txt.sig +++ b/.ansible-sign/sha256sum.txt.sig @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNATURE----- -iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmUgHfUACgkQTiIiIXrU -DNE+lwv/Sf3MsrOQ1fP2krKsJ8d8KoHAkZWJbXqxKJTVVSJputpvtqQ8zia69d00 -H28Gavq3NTjIwPB3fEFuM8l7D4VgDogPebZe2mxARjeavuYyN03pXC7q6L3bJLvp -/scfSkw6tajIbkXZtDq5Y5NtG0j/TocVqUVhvMNQrDOxFQy5+U53IhpIJEJ+py6v -V2aZ9CCirKvVczH0Rv6JcZc+eeuyxDm0BxjI2wOnMwsjjv35JLwvMVHvfUt+1OT4 -LTETvbWFt/S4YPRLv4Gp9ySVt6YZSu/l6PnZaI1fAb1aDcidd+ZEKe/+FFRe58kP -nQSSHMXBZp+pQcamgvoWfvgBeqCk9SBykeuLPXMF/OqY1fGQ6C16s7iZ0sJyQ3Tc -0JTW7VaNhGrMJPui1d3x0yzW32hHo/PZ5vhQv8tBxucprm7vI5DbPAzQgAkWM7lK -KQo7UIt45OZO8Y4ozEln2oL0sQqxOQwT2jHC1Z3hj6tikUSZdqehVvmCIvdtZJHo -lrlqDWRm -=Gh4x +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 -----END PGP SIGNATURE----- diff --git a/roles/webservers_collection/tasks/main.yml b/roles/webservers_collection/tasks/main.yml index d13a37a..e576dfc 100644 --- a/roles/webservers_collection/tasks/main.yml +++ b/roles/webservers_collection/tasks/main.yml @@ -2,12 +2,12 @@ - name: Setup webserver RHEL ansible.builtin.include_tasks: rhel_apache_collections.yml - when: os is match("rhel.*") or os is match ("Red Hat Enterprise Linux") + when: os is match("rhel.*") or os == "Red Hat Enterprise Linux" tags: - updaterhel - name: Setup webserver Windows ansible.builtin.include_tasks: windows_iis_collections.yml - when: os is match("windows.*") or os is match("2016.*") or os is match("Windows") + when: os is match("windows.*") or os is match("2016.*") or os == "Windows" tags: - updatewin