roles/common: re-work fail2ban and nftables

Re-work the fail2ban and nftables interaction. Use systemd's PartOf to indicate that fail2ban is part of the nftables service, which tells systemd to propogate stop/start signals to it. Then we tell the firehol update script to restart nftables instead of reload. The different between restart and reload is meaningless for nftables but we want systemd to propagate the stop/start signals to fail2ban.
roles/common: adjust update-firehol-nftables.service
2025-07-08 10:39:17 +03:00 · 2025-07-08 10:37:39 +03:00 · 2025-07-08 10:34:34 +03:00 · 2025-07-08 10:25:09 +03:00
5 changed files with 433 additions and 436 deletions
--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -18,37 +18,37 @@
    "default": {
        "ansible": {
            "hashes": [
-                "sha256:d25a7f26bf5821f8043bc806019822fd2810bd65e6b6bafb698bbeedadba72bf",
-                "sha256:fb56f6e5d5b08f69499a76f0972ac0b88ddc488ada1f386129ba40cb0b5c6ec7"
+                "sha256:caa56fc92e5bea012abf37f08aa348da27d2fcaf94bf398e24cadcb618a4dc3b",
+                "sha256:f9df37c71d407f65bcb9c5c06c9918e297d9ea74b5cdaf5926c4c9aa9e44db5f"
            ],
            "index": "pypi",
            "markers": "python_version >= '3.11'",
-            "version": "==11.4.0"
+            "version": "==11.7.0"
        },
        "ansible-compat": {
            "hashes": [
-                "sha256:25acf1bb49d8072e2737fc109fa9aa981ca9fed17b075af3c812635dad48ba2a",
-                "sha256:ebf8620021dd25c2d7c3e8e9382efbe7328db58ea396cbbe688ebef80dc8f8ae"
+                "sha256:c2b4bfeca6383b2047b2e1dea473cec4f1f9f2dd59beef71d6c47f632eaf97c9",
+                "sha256:cced722001bd7b617d418e54017e308c8b27ef3815f377843c00e020fa07165e"
            ],
            "markers": "python_version >= '3.10'",
-            "version": "==25.1.4"
+            "version": "==25.6.0"
        },
        "ansible-core": {
            "hashes": [
-                "sha256:c642d484c1d3486a923b152150034eddd5cdf4bea58039c928183900fb35d8ba",
-                "sha256:e1f8f5c33546362b0ee933e0969a3ba364b486515a6fa1bc25ebb5d95f8ec5f4"
+                "sha256:12a34749a7b20f0f1536bd3e3b2e137341867e4642e351273e96647161f595c0",
+                "sha256:25bb20ce1516a1b7307831b263cef684043b3720711466bd9d4164e5fd576557"
            ],
            "markers": "python_version >= '3.11'",
-            "version": "==2.18.4"
+            "version": "==2.18.6"
        },
        "ansible-lint": {
            "hashes": [
-                "sha256:b68b2149423246ec6369be86df2b79e3555b2b71507e4f7915671ec77381fa2b",
-                "sha256:ff92b31c83a2366381907e21c9a9d4de57f0cd7574e9943ea1b7e32b371f31a2"
+                "sha256:69fe294a3cc30d8819b5a30625a7e25225f48558cadb83ad3d4dec597c1b8c2c",
+                "sha256:6a1dd2b7a9f3f202c9e92a6c80296ff33ca863348c3acf978f80fb0d4536dce4"
            ],
            "index": "pypi",
            "markers": "python_version >= '3.10'",
-            "version": "==25.1.3"
+            "version": "==25.6.1"
        },
        "attrs": {
            "hashes": [
@ -88,11 +88,11 @@
        },
        "bracex": {
            "hashes": [
-                "sha256:12c50952415bfa773d2d9ccb8e79651b8cdb1f31a42f6091b804f6ba2b4a66b6",
-                "sha256:13e5732fec27828d6af308628285ad358047cec36801598368cb28bc631dbaf6"
+                "sha256:0b0049264e7340b3ec782b5cb99beb325f36c3782a32e36e876452fd49a09952",
+                "sha256:98f1347cd77e22ee8d967a30ad4e310b233f7754dbf31ff3fceb76145ba47dc7"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.5.post1"
+            "markers": "python_version >= '3.9'",
+            "version": "==2.6"
        },
        "cffi": {
            "hashes": [
@ -169,52 +169,54 @@
        },
        "click": {
            "hashes": [
-                "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2",
-                "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a"
+                "sha256:27c491cc05d968d271d5a1db13e3b5a184636d9d930f148c50b038f0d0646202",
+                "sha256:61a3265b914e850b85317d0b3109c7f8cd35a670f963866005d6ef1d5175a12b"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==8.1.8"
+            "markers": "python_version >= '3.10'",
+            "version": "==8.2.1"
        },
        "cryptography": {
            "hashes": [
-                "sha256:04abd71114848aa25edb28e225ab5f268096f44cf0127f3d36975bdf1bdf3390",
-                "sha256:0529b1d5a0105dd3731fa65680b45ce49da4d8115ea76e9da77a875396727b41",
-                "sha256:1bc312dfb7a6e5d66082c87c34c8a62176e684b6fe3d90fcfe1568de675e6688",
-                "sha256:268e4e9b177c76d569e8a145a6939eca9a5fec658c932348598818acf31ae9a5",
-                "sha256:29ecec49f3ba3f3849362854b7253a9f59799e3763b0c9d0826259a88efa02f1",
-                "sha256:2bf7bf75f7df9715f810d1b038870309342bff3069c5bd8c6b96128cb158668d",
-                "sha256:3b721b8b4d948b218c88cb8c45a01793483821e709afe5f622861fc6182b20a7",
-                "sha256:3c00b6b757b32ce0f62c574b78b939afab9eecaf597c4d624caca4f9e71e7843",
-                "sha256:3dc62975e31617badc19a906481deacdeb80b4bb454394b4098e3f2525a488c5",
-                "sha256:4973da6ca3db4405c54cd0b26d328be54c7747e89e284fcff166132eb7bccc9c",
-                "sha256:4e389622b6927d8133f314949a9812972711a111d577a5d1f4bee5e58736b80a",
-                "sha256:51e4de3af4ec3899d6d178a8c005226491c27c4ba84101bfb59c901e10ca9f79",
-                "sha256:5f6f90b72d8ccadb9c6e311c775c8305381db88374c65fa1a68250aa8a9cb3a6",
-                "sha256:6210c05941994290f3f7f175a4a57dbbb2afd9273657614c506d5976db061181",
-                "sha256:6f101b1f780f7fc613d040ca4bdf835c6ef3b00e9bd7125a4255ec574c7916e4",
-                "sha256:7bdcd82189759aba3816d1f729ce42ffded1ac304c151d0a8e89b9996ab863d5",
-                "sha256:7ca25849404be2f8e4b3c59483d9d3c51298a22c1c61a0e84415104dacaf5562",
-                "sha256:81276f0ea79a208d961c433a947029e1a15948966658cf6710bbabb60fcc2639",
-                "sha256:8cadc6e3b5a1f144a039ea08a0bdb03a2a92e19c46be3285123d32029f40a922",
-                "sha256:8e0ddd63e6bf1161800592c71ac794d3fb8001f2caebe0966e77c5234fa9efc3",
-                "sha256:909c97ab43a9c0c0b0ada7a1281430e4e5ec0458e6d9244c0e821bbf152f061d",
-                "sha256:96e7a5e9d6e71f9f4fca8eebfd603f8e86c5225bb18eb621b2c1e50b290a9471",
-                "sha256:9a1e657c0f4ea2a23304ee3f964db058c9e9e635cc7019c4aa21c330755ef6fd",
-                "sha256:9eb9d22b0a5d8fd9925a7764a054dca914000607dff201a24c791ff5c799e1fa",
-                "sha256:af4ff3e388f2fa7bff9f7f2b31b87d5651c45731d3e8cfa0944be43dff5cfbdb",
-                "sha256:b042d2a275c8cee83a4b7ae30c45a15e6a4baa65a179a0ec2d78ebb90e4f6699",
-                "sha256:bc821e161ae88bfe8088d11bb39caf2916562e0a2dc7b6d56714a48b784ef0bb",
-                "sha256:c505d61b6176aaf982c5717ce04e87da5abc9a36a5b39ac03905c4aafe8de7aa",
-                "sha256:c63454aa261a0cf0c5b4718349629793e9e634993538db841165b3df74f37ec0",
-                "sha256:c7362add18b416b69d58c910caa217f980c5ef39b23a38a0880dfd87bdf8cd23",
-                "sha256:d03806036b4f89e3b13b6218fefea8d5312e450935b1a2d55f0524e2ed7c59d9",
-                "sha256:d1b3031093a366ac767b3feb8bcddb596671b3aaff82d4050f984da0c248b615",
-                "sha256:d1c3572526997b36f245a96a2b1713bf79ce99b271bbcf084beb6b9b075f29ea",
-                "sha256:efcfe97d1b3c79e486554efddeb8f6f53a4cdd4cf6086642784fa31fc384e1d7",
-                "sha256:f514ef4cd14bb6fb484b4a60203e912cfcb64f2ab139e88c2274511514bf7308"
+                "sha256:0027d566d65a38497bc37e0dd7c2f8ceda73597d2ac9ba93810204f56f52ebc7",
+                "sha256:101ee65078f6dd3e5a028d4f19c07ffa4dd22cce6a20eaa160f8b5219911e7d8",
+                "sha256:12e55281d993a793b0e883066f590c1ae1e802e3acb67f8b442e721e475e6463",
+                "sha256:14d96584701a887763384f3c47f0ca7c1cce322aa1c31172680eb596b890ec30",
+                "sha256:1e1da5accc0c750056c556a93c3e9cb828970206c68867712ca5805e46dc806f",
+                "sha256:206210d03c1193f4e1ff681d22885181d47efa1ab3018766a7b32a7b3d6e6afd",
+                "sha256:2089cc8f70a6e454601525e5bf2779e665d7865af002a5dec8d14e561002e135",
+                "sha256:3a264aae5f7fbb089dbc01e0242d3b67dffe3e6292e1f5182122bdf58e65215d",
+                "sha256:3af26738f2db354aafe492fb3869e955b12b2ef2e16908c8b9cb928128d42c57",
+                "sha256:3fcfbefc4a7f332dece7272a88e410f611e79458fab97b5efe14e54fe476f4fd",
+                "sha256:460f8c39ba66af7db0545a8c6f2eabcbc5a5528fc1cf6c3fa9a1e44cec33385e",
+                "sha256:57c816dfbd1659a367831baca4b775b2a5b43c003daf52e9d57e1d30bc2e1b0e",
+                "sha256:5aa1e32983d4443e310f726ee4b071ab7569f58eedfdd65e9675484a4eb67bd1",
+                "sha256:6ff8728d8d890b3dda5765276d1bc6fb099252915a2cd3aff960c4c195745dd0",
+                "sha256:7259038202a47fdecee7e62e0fd0b0738b6daa335354396c6ddebdbe1206af2a",
+                "sha256:72e76caa004ab63accdf26023fccd1d087f6d90ec6048ff33ad0445abf7f605a",
+                "sha256:7760c1c2e1a7084153a0f68fab76e754083b126a47d0117c9ed15e69e2103492",
+                "sha256:8c4a6ff8a30e9e3d38ac0539e9a9e02540ab3f827a3394f8852432f6b0ea152e",
+                "sha256:9024beb59aca9d31d36fcdc1604dd9bbeed0a55bface9f1908df19178e2f116e",
+                "sha256:90cb0a7bb35959f37e23303b7eed0a32280510030daba3f7fdfbb65defde6a97",
+                "sha256:91098f02ca81579c85f66df8a588c78f331ca19089763d733e34ad359f474174",
+                "sha256:926c3ea71a6043921050eaa639137e13dbe7b4ab25800932a8498364fc1abec9",
+                "sha256:982518cd64c54fcada9d7e5cf28eabd3ee76bd03ab18e08a48cad7e8b6f31b18",
+                "sha256:9b4cf6318915dccfe218e69bbec417fdd7c7185aa7aab139a2c0beb7468c89f0",
+                "sha256:ad0caded895a00261a5b4aa9af828baede54638754b51955a0ac75576b831b27",
+                "sha256:b85980d1e345fe769cfc57c57db2b59cff5464ee0c045d52c0df087e926fbe63",
+                "sha256:b8fa8b0a35a9982a3c60ec79905ba5bb090fc0b9addcfd3dc2dd04267e45f25e",
+                "sha256:b9e38e0a83cd51e07f5a48ff9691cae95a79bea28fe4ded168a8e5c6c77e819d",
+                "sha256:bd4c45986472694e5121084c6ebbd112aa919a25e783b87eb95953c9573906d6",
+                "sha256:be97d3a19c16a9be00edf79dca949c8fa7eff621763666a145f9f9535a5d7f42",
+                "sha256:c648025b6840fe62e57107e0a25f604db740e728bd67da4f6f060f03017d5097",
+                "sha256:d05a38884db2ba215218745f0781775806bde4f32e07b135348355fe8e4991d9",
+                "sha256:dd420e577921c8c2d31289536c386aaa30140b473835e97f83bc71ea9d2baf2d",
+                "sha256:e357286c1b76403dd384d938f93c46b2b058ed4dfcdce64a770f0537ed3feb6f",
+                "sha256:e6c00130ed423201c5bc5544c23359141660b07999ad82e34e7bb8f882bb78e0",
+                "sha256:e74d30ec9c7cb2f404af331d5b4099a9b322a8a6b25c4632755c8757345baac5",
+                "sha256:f3562c2f23c612f2e4a6964a61d942f891d29ee320edb62ff48ffb99f3de9ae8"
            ],
            "markers": "python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'",
-            "version": "==44.0.2"
+            "version": "==45.0.5"
        },
        "filelock": {
            "hashes": [
@ -226,11 +228,11 @@
        },
        "importlib-metadata": {
            "hashes": [
-                "sha256:02a89390c1e15fdfdc0d7c6b25cb3e62650d0494005c97d6f148bf5b9787525e",
-                "sha256:310b41d755445d74569f993ccfc22838295d9fe005425094fad953d7f15c8580"
+                "sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000",
+                "sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd"
            ],
            "markers": "python_version >= '3.9'",
-            "version": "==8.6.1"
+            "version": "==8.7.0"
        },
        "jinja2": {
            "hashes": [
@ -242,27 +244,19 @@
        },
        "jsonschema": {
            "hashes": [
-                "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4",
-                "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566"
+                "sha256:0b4e8069eb12aedfa881333004bccaec24ecef5a8a6a4b6df142b2cc9599d196",
+                "sha256:a462455f19f5faf404a7902952b6f0e3ce868f3ee09a359b05eca6673bd8412d"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==4.23.0"
+            "markers": "python_version >= '3.9'",
+            "version": "==4.24.0"
        },
        "jsonschema-specifications": {
            "hashes": [
-                "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272",
-                "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf"
+                "sha256:4653bffbd6584f7de83a67e0d620ef16900b390ddc7939d56684d6c81e33f1af",
+                "sha256:630159c9f4dbea161a6a2205c3011cc4f18ff381b189fff48bb39b9bf26ae608"
            ],
            "markers": "python_version >= '3.9'",
-            "version": "==2024.10.1"
-        },
-        "markdown-it-py": {
-            "hashes": [
-                "sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1",
-                "sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.0.0"
+            "version": "==2025.4.1"
        },
        "markupsafe": {
            "hashes": [
@ -331,29 +325,21 @@
            "markers": "python_version >= '3.9'",
            "version": "==3.0.2"
        },
-        "mdurl": {
-            "hashes": [
-                "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8",
-                "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.1.2"
-        },
        "mypy-extensions": {
            "hashes": [
-                "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d",
-                "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"
+                "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505",
+                "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558"
            ],
-            "markers": "python_version >= '3.5'",
-            "version": "==1.0.0"
+            "markers": "python_version >= '3.8'",
+            "version": "==1.1.0"
        },
        "packaging": {
            "hashes": [
-                "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
-                "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"
+                "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484",
+                "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f"
            ],
            "markers": "python_version >= '3.8'",
-            "version": "==24.2"
+            "version": "==25.0"
        },
        "pathspec": {
            "hashes": [
@ -365,11 +351,11 @@
        },
        "platformdirs": {
            "hashes": [
-                "sha256:a03875334331946f13c549dbd8f4bac7a13a50a895a0eb1e8c6a8ace80d40a94",
-                "sha256:eb437d586b6a0986388f0d6f74aa0cde27b48d0e3d66843640bfb6bdcdb6e351"
+                "sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc",
+                "sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4"
            ],
            "markers": "python_version >= '3.9'",
-            "version": "==4.3.7"
+            "version": "==4.3.8"
        },
        "pycparser": {
            "hashes": [
@ -379,14 +365,6 @@
            "markers": "python_version >= '3.8'",
            "version": "==2.22"
        },
-        "pygments": {
-            "hashes": [
-                "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199",
-                "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.18.0"
-        },
        "pyyaml": {
            "hashes": [
                "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff",
@ -461,197 +439,215 @@
            ],
            "version": "==1.0.1"
        },
-        "rich": {
-            "hashes": [
-                "sha256:2e85306a063b9492dffc86278197a60cbece75bcb766022f3436f567cae11bdc",
-                "sha256:a5ac1f1cd448ade0d59cc3356f7db7a7ccda2c8cbae9c7a90c28ff463d3e91f4"
-            ],
-            "markers": "python_full_version >= '3.7.0'",
-            "version": "==13.8.0"
-        },
        "rpds-py": {
            "hashes": [
-                "sha256:0047638c3aa0dbcd0ab99ed1e549bbf0e142c9ecc173b6492868432d8989a046",
-                "sha256:006f4342fe729a368c6df36578d7a348c7c716be1da0a1a0f86e3021f8e98724",
-                "sha256:041f00419e1da7a03c46042453598479f45be3d787eb837af382bfc169c0db33",
-                "sha256:04ecf5c1ff4d589987b4d9882872f80ba13da7d42427234fce8f22efb43133bc",
-                "sha256:04f2b712a2206e13800a8136b07aaedc23af3facab84918e7aa89e4be0260032",
-                "sha256:0aeb3329c1721c43c58cae274d7d2ca85c1690d89485d9c63a006cb79a85771a",
-                "sha256:0e374c0ce0ca82e5b67cd61fb964077d40ec177dd2c4eda67dba130de09085c7",
-                "sha256:0f00c16e089282ad68a3820fd0c831c35d3194b7cdc31d6e469511d9bffc535c",
-                "sha256:174e46569968ddbbeb8a806d9922f17cd2b524aa753b468f35b97ff9c19cb718",
-                "sha256:1b221c2457d92a1fb3c97bee9095c874144d196f47c038462ae6e4a14436f7bc",
-                "sha256:208b3a70a98cf3710e97cabdc308a51cd4f28aa6e7bb11de3d56cd8b74bab98d",
-                "sha256:20f2712bd1cc26a3cc16c5a1bfee9ed1abc33d4cdf1aabd297fe0eb724df4272",
-                "sha256:24795c099453e3721fda5d8ddd45f5dfcc8e5a547ce7b8e9da06fecc3832e26f",
-                "sha256:2a0f156e9509cee987283abd2296ec816225145a13ed0391df8f71bf1d789e2d",
-                "sha256:2b2356688e5d958c4d5cb964af865bea84db29971d3e563fb78e46e20fe1848b",
-                "sha256:2c13777ecdbbba2077670285dd1fe50828c8742f6a4119dbef6f83ea13ad10fb",
-                "sha256:2d3ee4615df36ab8eb16c2507b11e764dcc11fd350bbf4da16d09cda11fcedef",
-                "sha256:2d53747da70a4e4b17f559569d5f9506420966083a31c5fbd84e764461c4444b",
-                "sha256:32bab0a56eac685828e00cc2f5d1200c548f8bc11f2e44abf311d6b548ce2e45",
-                "sha256:34d90ad8c045df9a4259c47d2e16a3f21fdb396665c94520dbfe8766e62187a4",
-                "sha256:369d9c6d4c714e36d4a03957b4783217a3ccd1e222cdd67d464a3a479fc17796",
-                "sha256:3a55fc10fdcbf1a4bd3c018eea422c52cf08700cf99c28b5cb10fe97ab77a0d3",
-                "sha256:3d2d8e4508e15fc05b31285c4b00ddf2e0eb94259c2dc896771966a163122a0c",
-                "sha256:3fab5f4a2c64a8fb64fc13b3d139848817a64d467dd6ed60dcdd6b479e7febc9",
-                "sha256:43dba99f00f1d37b2a0265a259592d05fcc8e7c19d140fe51c6e6f16faabeb1f",
-                "sha256:44d51febb7a114293ffd56c6cf4736cb31cd68c0fddd6aa303ed09ea5a48e029",
-                "sha256:493fe54318bed7d124ce272fc36adbf59d46729659b2c792e87c3b95649cdee9",
-                "sha256:4b28e5122829181de1898c2c97f81c0b3246d49f585f22743a1246420bb8d399",
-                "sha256:4cd031e63bc5f05bdcda120646a0d32f6d729486d0067f09d79c8db5368f4586",
-                "sha256:528927e63a70b4d5f3f5ccc1fa988a35456eb5d15f804d276709c33fc2f19bda",
-                "sha256:564c96b6076a98215af52f55efa90d8419cc2ef45d99e314fddefe816bc24f91",
-                "sha256:5db385bacd0c43f24be92b60c857cf760b7f10d8234f4bd4be67b5b20a7c0b6b",
-                "sha256:5ef877fa3bbfb40b388a5ae1cb00636a624690dcb9a29a65267054c9ea86d88a",
-                "sha256:5f6e3cec44ba05ee5cbdebe92d052f69b63ae792e7d05f1020ac5e964394080c",
-                "sha256:5fc13b44de6419d1e7a7e592a4885b323fbc2f46e1f22151e3a8ed3b8b920405",
-                "sha256:60748789e028d2a46fc1c70750454f83c6bdd0d05db50f5ae83e2db500b34da5",
-                "sha256:60d9b630c8025b9458a9d114e3af579a2c54bd32df601c4581bd054e85258143",
-                "sha256:619ca56a5468f933d940e1bf431c6f4e13bef8e688698b067ae68eb4f9b30e3a",
-                "sha256:630d3d8ea77eabd6cbcd2ea712e1c5cecb5b558d39547ac988351195db433f6c",
-                "sha256:63981feca3f110ed132fd217bf7768ee8ed738a55549883628ee3da75bb9cb78",
-                "sha256:66420986c9afff67ef0c5d1e4cdc2d0e5262f53ad11e4f90e5e22448df485bf0",
-                "sha256:675269d407a257b8c00a6b58205b72eec8231656506c56fd429d924ca00bb350",
-                "sha256:6a4a535013aeeef13c5532f802708cecae8d66c282babb5cd916379b72110cf7",
-                "sha256:6a727fd083009bc83eb83d6950f0c32b3c94c8b80a9b667c87f4bd1274ca30ba",
-                "sha256:6e1daf5bf6c2be39654beae83ee6b9a12347cb5aced9a29eecf12a2d25fff664",
-                "sha256:6eea559077d29486c68218178ea946263b87f1c41ae7f996b1f30a983c476a5a",
-                "sha256:75a810b7664c17f24bf2ffd7f92416c00ec84b49bb68e6a0d93e542406336b56",
-                "sha256:772cc1b2cd963e7e17e6cc55fe0371fb9c704d63e44cacec7b9b7f523b78919e",
-                "sha256:78884d155fd15d9f64f5d6124b486f3d3f7fd7cd71a78e9670a0f6f6ca06fb2d",
-                "sha256:79e8d804c2ccd618417e96720ad5cd076a86fa3f8cb310ea386a3e6229bae7d1",
-                "sha256:7e80d375134ddb04231a53800503752093dbb65dad8dabacce2c84cccc78e964",
-                "sha256:8097b3422d020ff1c44effc40ae58e67d93e60d540a65649d2cdaf9466030791",
-                "sha256:8205ee14463248d3349131bb8099efe15cd3ce83b8ef3ace63c7e976998e7124",
-                "sha256:8212ff58ac6dfde49946bea57474a386cca3f7706fc72c25b772b9ca4af6b79e",
-                "sha256:823e74ab6fbaa028ec89615ff6acb409e90ff45580c45920d4dfdddb069f2120",
-                "sha256:84e0566f15cf4d769dade9b366b7b87c959be472c92dffb70462dd0844d7cbad",
-                "sha256:896c41007931217a343eff197c34513c154267636c8056fb409eafd494c3dcdc",
-                "sha256:8aa362811ccdc1f8dadcc916c6d47e554169ab79559319ae9fae7d7752d0d60c",
-                "sha256:8b3b397eefecec8e8e39fa65c630ef70a24b09141a6f9fc17b3c3a50bed6b50e",
-                "sha256:8ebc7e65ca4b111d928b669713865f021b7773350eeac4a31d3e70144297baba",
-                "sha256:9168764133fd919f8dcca2ead66de0105f4ef5659cbb4fa044f7014bed9a1797",
-                "sha256:921ae54f9ecba3b6325df425cf72c074cd469dea843fb5743a26ca7fb2ccb149",
-                "sha256:92558d37d872e808944c3c96d0423b8604879a3d1c86fdad508d7ed91ea547d5",
-                "sha256:951cc481c0c395c4a08639a469d53b7d4afa252529a085418b82a6b43c45c240",
-                "sha256:998c01b8e71cf051c28f5d6f1187abbdf5cf45fc0efce5da6c06447cba997034",
-                "sha256:9abc80fe8c1f87218db116016de575a7998ab1629078c90840e8d11ab423ee25",
-                "sha256:9be4f99bee42ac107870c61dfdb294d912bf81c3c6d45538aad7aecab468b6b7",
-                "sha256:9c39438c55983d48f4bb3487734d040e22dad200dab22c41e331cee145e7a50d",
-                "sha256:9d7e8ce990ae17dda686f7e82fd41a055c668e13ddcf058e7fb5e9da20b57793",
-                "sha256:9ea7f4174d2e4194289cb0c4e172d83e79a6404297ff95f2875cf9ac9bced8ba",
-                "sha256:a18fc371e900a21d7392517c6f60fe859e802547309e94313cd8181ad9db004d",
-                "sha256:a36b452abbf29f68527cf52e181fced56685731c86b52e852053e38d8b60bc8d",
-                "sha256:a5b66d1b201cc71bc3081bc2f1fc36b0c1f268b773e03bbc39066651b9e18391",
-                "sha256:a824d2c7a703ba6daaca848f9c3d5cb93af0505be505de70e7e66829affd676e",
-                "sha256:a88c0d17d039333a41d9bf4616bd062f0bd7aa0edeb6cafe00a2fc2a804e944f",
-                "sha256:aa6800adc8204ce898c8a424303969b7aa6a5e4ad2789c13f8648739830323b7",
-                "sha256:aad911555286884be1e427ef0dc0ba3929e6821cbeca2194b13dc415a462c7fd",
-                "sha256:afc6e35f344490faa8276b5f2f7cbf71f88bc2cda4328e00553bd451728c571f",
-                "sha256:b9a4df06c35465ef4d81799999bba810c68d29972bf1c31db61bfdb81dd9d5bb",
-                "sha256:bb2954155bb8f63bb19d56d80e5e5320b61d71084617ed89efedb861a684baea",
-                "sha256:bbc4362e06f950c62cad3d4abf1191021b2ffaf0b31ac230fbf0526453eee75e",
-                "sha256:c0145295ca415668420ad142ee42189f78d27af806fcf1f32a18e51d47dd2052",
-                "sha256:c30ff468163a48535ee7e9bf21bd14c7a81147c0e58a36c1078289a8ca7af0bd",
-                "sha256:c347a20d79cedc0a7bd51c4d4b7dbc613ca4e65a756b5c3e57ec84bd43505b47",
-                "sha256:c43583ea8517ed2e780a345dd9960896afc1327e8cf3ac8239c167530397440d",
-                "sha256:c61a2cb0085c8783906b2f8b1f16a7e65777823c7f4d0a6aaffe26dc0d358dd9",
-                "sha256:c9ca89938dff18828a328af41ffdf3902405a19f4131c88e22e776a8e228c5a8",
-                "sha256:cc31e13ce212e14a539d430428cd365e74f8b2d534f8bc22dd4c9c55b277b875",
-                "sha256:cdabcd3beb2a6dca7027007473d8ef1c3b053347c76f685f5f060a00327b8b65",
-                "sha256:cf86f72d705fc2ef776bb7dd9e5fbba79d7e1f3e258bf9377f8204ad0fc1c51e",
-                "sha256:d09dc82af2d3c17e7dd17120b202a79b578d79f2b5424bda209d9966efeed114",
-                "sha256:d3aa13bdf38630da298f2e0d77aca967b200b8cc1473ea05248f6c5e9c9bdb44",
-                "sha256:d69d003296df4840bd445a5d15fa5b6ff6ac40496f956a221c4d1f6f7b4bc4d9",
-                "sha256:d6e109a454412ab82979c5b1b3aee0604eca4bbf9a02693bb9df027af2bfa91a",
-                "sha256:d8551e733626afec514b5d15befabea0dd70a343a9f23322860c4f16a9430205",
-                "sha256:d8754d872a5dfc3c5bf9c0e059e8107451364a30d9fd50f1f1a85c4fb9481164",
-                "sha256:d8f9a6e7fd5434817526815f09ea27f2746c4a51ee11bb3439065f5fc754db58",
-                "sha256:dbcbb6db5582ea33ce46a5d20a5793134b5365110d84df4e30b9d37c6fd40ad3",
-                "sha256:e0f3ef95795efcd3b2ec3fe0a5bcfb5dadf5e3996ea2117427e524d4fbf309c6",
-                "sha256:e13ae74a8a3a0c2f22f450f773e35f893484fcfacb00bb4344a7e0f4f48e1f97",
-                "sha256:e274f62cbd274359eff63e5c7e7274c913e8e09620f6a57aae66744b3df046d6",
-                "sha256:e838bf2bb0b91ee67bf2b889a1a841e5ecac06dd7a2b1ef4e6151e2ce155c7ae",
-                "sha256:e8acd55bd5b071156bae57b555f5d33697998752673b9de554dd82f5b5352727",
-                "sha256:e8e5ab32cf9eb3647450bc74eb201b27c185d3857276162c101c0f8c6374e098",
-                "sha256:ebcb786b9ff30b994d5969213a8430cbb984cdd7ea9fd6df06663194bd3c450c",
-                "sha256:ebea2821cdb5f9fef44933617be76185b80150632736f3d76e54829ab4a3b4d1",
-                "sha256:ed0ef550042a8dbcd657dfb284a8ee00f0ba269d3f2286b0493b15a5694f9fe8",
-                "sha256:eda5c1e2a715a4cbbca2d6d304988460942551e4e5e3b7457b50943cd741626d",
-                "sha256:f5c0ed12926dec1dfe7d645333ea59cf93f4d07750986a586f511c0bc61fe103",
-                "sha256:f6016bd950be4dcd047b7475fdf55fb1e1f59fc7403f387be0e8123e4a576d30",
-                "sha256:f9e0057a509e096e47c87f753136c9b10d7a91842d8042c2ee6866899a717c0d",
-                "sha256:fc1c892b1ec1f8cbd5da8de287577b455e388d9c328ad592eabbdcb6fc93bee5",
-                "sha256:fc2c1e1b00f88317d9de6b2c2b39b012ebbfe35fe5e7bef980fd2a91f6100a07",
-                "sha256:fd822f019ccccd75c832deb7aa040bb02d70a92eb15a2f16c7987b7ad4ee8d83"
+                "sha256:0919f38f5542c0a87e7b4afcafab6fd2c15386632d249e9a087498571250abe3",
+                "sha256:093d63b4b0f52d98ebae33b8c50900d3d67e0666094b1be7a12fffd7f65de74b",
+                "sha256:0a0b60701f2300c81b2ac88a5fb893ccfa408e1c4a555a77f908a2596eb875a5",
+                "sha256:0c71c2f6bf36e61ee5c47b2b9b5d47e4d1baad6426bfed9eea3e858fc6ee8806",
+                "sha256:0dc23bbb3e06ec1ea72d515fb572c1fea59695aefbffb106501138762e1e915e",
+                "sha256:0dfa6115c6def37905344d56fb54c03afc49104e2ca473d5dedec0f6606913b4",
+                "sha256:12bff2ad9447188377f1b2794772f91fe68bb4bbfa5a39d7941fbebdbf8c500f",
+                "sha256:1533b7eb683fb5f38c1d68a3c78f5fdd8f1412fa6b9bf03b40f450785a0ab915",
+                "sha256:1766b5724c3f779317d5321664a343c07773c8c5fd1532e4039e6cc7d1a815be",
+                "sha256:181ef9b6bbf9845a264f9aa45c31836e9f3c1f13be565d0d010e964c661d1e2b",
+                "sha256:183f857a53bcf4b1b42ef0f57ca553ab56bdd170e49d8091e96c51c3d69ca696",
+                "sha256:191aa858f7d4902e975d4cf2f2d9243816c91e9605070aeb09c0a800d187e323",
+                "sha256:1a8b0dd8648709b62d9372fc00a57466f5fdeefed666afe3fea5a6c9539a0331",
+                "sha256:1c962145c7473723df9722ba4c058de12eb5ebedcb4e27e7d902920aa3831ee8",
+                "sha256:1cc81d14ddfa53d7f3906694d35d54d9d3f850ef8e4e99ee68bc0d1e5fed9a9c",
+                "sha256:1d815d48b1804ed7867b539236b6dd62997850ca1c91cad187f2ddb1b7bbef19",
+                "sha256:1e6c15d2080a63aaed876e228efe4f814bc7889c63b1e112ad46fdc8b368b9e1",
+                "sha256:20ab1ae4fa534f73647aad289003f1104092890849e0266271351922ed5574f8",
+                "sha256:20dae58a859b0906f0685642e591056f1e787f3a8b39c8e8749a45dc7d26bdb0",
+                "sha256:238e8c8610cb7c29460e37184f6799547f7e09e6a9bdbdab4e8edb90986a2318",
+                "sha256:24a4146ccb15be237fdef10f331c568e1b0e505f8c8c9ed5d67759dac58ac246",
+                "sha256:257d011919f133a4746958257f2c75238e3ff54255acd5e3e11f3ff41fd14256",
+                "sha256:2a343f91b17097c546b93f7999976fd6c9d5900617aa848c81d794e062ab302b",
+                "sha256:2abe21d8ba64cded53a2a677e149ceb76dcf44284202d737178afe7ba540c1eb",
+                "sha256:2c03c9b0c64afd0320ae57de4c982801271c0c211aa2d37f3003ff5feb75bb04",
+                "sha256:2c9c1b92b774b2e68d11193dc39620d62fd8ab33f0a3c77ecdabe19c179cdbc1",
+                "sha256:3021933c2cb7def39d927b9862292e0f4c75a13d7de70eb0ab06efed4c508c19",
+                "sha256:3100b3090269f3a7ea727b06a6080d4eb7439dca4c0e91a07c5d133bb1727ea7",
+                "sha256:313cfcd6af1a55a286a3c9a25f64af6d0e46cf60bc5798f1db152d97a216ff6f",
+                "sha256:35e9a70a0f335371275cdcd08bc5b8051ac494dd58bff3bbfb421038220dc871",
+                "sha256:38721d4c9edd3eb6670437d8d5e2070063f305bfa2d5aa4278c51cedcd508a84",
+                "sha256:390e3170babf42462739a93321e657444f0862c6d722a291accc46f9d21ed04e",
+                "sha256:39bfea47c375f379d8e87ab4bb9eb2c836e4f2069f0f65731d85e55d74666387",
+                "sha256:3ac51b65e8dc76cf4949419c54c5528adb24fc721df722fd452e5fbc236f5c40",
+                "sha256:3c0909c5234543ada2515c05dc08595b08d621ba919629e94427e8e03539c958",
+                "sha256:3da5852aad63fa0c6f836f3359647870e21ea96cf433eb393ffa45263a170d44",
+                "sha256:3e1157659470aa42a75448b6e943c895be8c70531c43cb78b9ba990778955582",
+                "sha256:4019a9d473c708cf2f16415688ef0b4639e07abaa569d72f74745bbeffafa2c7",
+                "sha256:43f10b007033f359bc3fa9cd5e6c1e76723f056ffa9a6b5c117cc35720a80292",
+                "sha256:49028aa684c144ea502a8e847d23aed5e4c2ef7cadfa7d5eaafcb40864844b7a",
+                "sha256:4916dc96489616a6f9667e7526af8fa693c0fdb4f3acb0e5d9f4400eb06a47ba",
+                "sha256:4a59e5bc386de021f56337f757301b337d7ab58baa40174fb150accd480bc953",
+                "sha256:4b1f66eb81eab2e0ff5775a3a312e5e2e16bf758f7b06be82fb0d04078c7ac51",
+                "sha256:4c5fe114a6dd480a510b6d3661d09d67d1622c4bf20660a474507aaee7eeeee9",
+                "sha256:4c70c70f9169692b36307a95f3d8c0a9fcd79f7b4a383aad5eaa0e9718b79b37",
+                "sha256:4d11382bcaf12f80b51d790dee295c56a159633a8e81e6323b16e55d81ae37e9",
+                "sha256:4f01a5d6444a3258b00dc07b6ea4733e26f8072b788bef750baa37b370266137",
+                "sha256:4f789e32fa1fb6a7bf890e0124e7b42d1e60d28ebff57fe806719abb75f0e9a3",
+                "sha256:4feb7511c29f8442cbbc28149a92093d32e815a28aa2c50d333826ad2a20fdf0",
+                "sha256:511d15193cbe013619dd05414c35a7dedf2088fcee93c6bbb7c77859765bd4e8",
+                "sha256:519067e29f67b5c90e64fb1a6b6e9d2ec0ba28705c51956637bac23a2f4ddae1",
+                "sha256:521ccf56f45bb3a791182dc6b88ae5f8fa079dd705ee42138c76deb1238e554e",
+                "sha256:529c8156d7506fba5740e05da8795688f87119cce330c244519cf706a4a3d618",
+                "sha256:582462833ba7cee52e968b0341b85e392ae53d44c0f9af6a5927c80e539a8b67",
+                "sha256:5963b72ccd199ade6ee493723d18a3f21ba7d5b957017607f815788cef50eaf1",
+                "sha256:59b2093224a18c6508d95cfdeba8db9cbfd6f3494e94793b58972933fcee4c6d",
+                "sha256:5afaddaa8e8c7f1f7b4c5c725c0070b6eed0228f705b90a1732a48e84350f4e9",
+                "sha256:5afea17ab3a126006dc2f293b14ffc7ef3c85336cf451564a0515ed7648033da",
+                "sha256:5e09330b21d98adc8ccb2dbb9fc6cb434e8908d4c119aeaa772cb1caab5440a0",
+                "sha256:6188de70e190847bb6db3dc3981cbadff87d27d6fe9b4f0e18726d55795cee9b",
+                "sha256:68ffcf982715f5b5b7686bdd349ff75d422e8f22551000c24b30eaa1b7f7ae84",
+                "sha256:696764a5be111b036256c0b18cd29783fab22154690fc698062fc1b0084b511d",
+                "sha256:69a607203441e07e9a8a529cff1d5b73f6a160f22db1097211e6212a68567d11",
+                "sha256:69b312fecc1d017b5327afa81d4da1480f51c68810963a7336d92203dbb3d4f1",
+                "sha256:69f0c0a3df7fd3a7eec50a00396104bb9a843ea6d45fcc31c2d5243446ffd7a7",
+                "sha256:6a1cb5d6ce81379401bbb7f6dbe3d56de537fb8235979843f0d53bc2e9815a79",
+                "sha256:6d3498ad0df07d81112aa6ec6c95a7e7b1ae00929fb73e7ebee0f3faaeabad2f",
+                "sha256:72a8d9564a717ee291f554eeb4bfeafe2309d5ec0aa6c475170bdab0f9ee8e88",
+                "sha256:777c62479d12395bfb932944e61e915741e364c843afc3196b694db3d669fcd0",
+                "sha256:77a7711fa562ba2da1aa757e11024ad6d93bad6ad7ede5afb9af144623e5f76a",
+                "sha256:79061ba1a11b6a12743a2b0f72a46aa2758613d454aa6ba4f5a265cc48850158",
+                "sha256:7a48af25d9b3c15684059d0d1fc0bc30e8eee5ca521030e2bffddcab5be40226",
+                "sha256:7ab504c4d654e4a29558eaa5bb8cea5fdc1703ea60a8099ffd9c758472cf913f",
+                "sha256:7bdb17009696214c3b66bb3590c6d62e14ac5935e53e929bcdbc5a495987a84f",
+                "sha256:7da84c2c74c0f5bc97d853d9e17bb83e2dcafcff0dc48286916001cc114379a1",
+                "sha256:801a71f70f9813e82d2513c9a96532551fce1e278ec0c64610992c49c04c2dad",
+                "sha256:824e6d3503ab990d7090768e4dfd9e840837bae057f212ff9f4f05ec6d1975e7",
+                "sha256:82b165b07f416bdccf5c84546a484cc8f15137ca38325403864bfdf2b5b72f6a",
+                "sha256:84cfbd4d4d2cdeb2be61a057a258d26b22877266dd905809e94172dff01a42ae",
+                "sha256:84d142d2d6cf9b31c12aa4878d82ed3b2324226270b89b676ac62ccd7df52d08",
+                "sha256:87a5531de9f71aceb8af041d72fc4cab4943648d91875ed56d2e629bef6d4c03",
+                "sha256:893b022bfbdf26d7bedb083efeea624e8550ca6eb98bf7fea30211ce95b9201a",
+                "sha256:894514d47e012e794f1350f076c427d2347ebf82f9b958d554d12819849a369d",
+                "sha256:8a7898b6ca3b7d6659e55cdac825a2e58c638cbf335cde41f4619e290dd0ad11",
+                "sha256:8ad7fd2258228bf288f2331f0a6148ad0186b2e3643055ed0db30990e59817a6",
+                "sha256:92c8db839367ef16a662478f0a2fe13e15f2227da3c1430a782ad0f6ee009ec9",
+                "sha256:941c1cfdf4799d623cf3aa1d326a6b4fdb7a5799ee2687f3516738216d2262fb",
+                "sha256:9bc596b30f86dc6f0929499c9e574601679d0341a0108c25b9b358a042f51bca",
+                "sha256:9c55b0a669976cf258afd718de3d9ad1b7d1fe0a91cd1ab36f38b03d4d4aeaaf",
+                "sha256:9da4e873860ad5bab3291438525cae80169daecbfafe5657f7f5fb4d6b3f96b9",
+                "sha256:9def736773fd56b305c0eef698be5192c77bfa30d55a0e5885f80126c4831a15",
+                "sha256:9dfbe56b299cf5875b68eb6f0ebaadc9cac520a1989cac0db0765abfb3709c19",
+                "sha256:9e851920caab2dbcae311fd28f4313c6953993893eb5c1bb367ec69d9a39e7ed",
+                "sha256:9e8cb77286025bdb21be2941d64ac6ca016130bfdcd228739e8ab137eb4406ed",
+                "sha256:a547e21c5610b7e9093d870be50682a6a6cf180d6da0f42c47c306073bfdbbf6",
+                "sha256:a90a13408a7a856b87be8a9f008fff53c5080eea4e4180f6c2e546e4a972fb5d",
+                "sha256:a9a63785467b2d73635957d32a4f6e73d5e4df497a16a6392fa066b753e87387",
+                "sha256:aa81873e2c8c5aa616ab8e017a481a96742fdf9313c40f14338ca7dbf50cb55f",
+                "sha256:ac64f4b2bdb4ea622175c9ab7cf09444e412e22c0e02e906978b3b488af5fde8",
+                "sha256:aea1f9741b603a8d8fedb0ed5502c2bc0accbc51f43e2ad1337fe7259c2b77a5",
+                "sha256:b0afb8cdd034150d4d9f53926226ed27ad15b7f465e93d7468caaf5eafae0d37",
+                "sha256:b37a04d9f52cb76b6b78f35109b513f6519efb481d8ca4c321f6a3b9580b3f45",
+                "sha256:b5f7a446ddaf6ca0fad9a5535b56fbfc29998bf0e0b450d174bbec0d600e1d72",
+                "sha256:b6d9e5a2ed9c4988c8f9b28b3bc0e3e5b1aaa10c28d210a594ff3a8c02742daf",
+                "sha256:b6e2c12160c72aeda9d1283e612f68804621f448145a210f1bf1d79151c47090",
+                "sha256:b818a592bd69bfe437ee8368603d4a2d928c34cffcdf77c2e761a759ffd17d20",
+                "sha256:c1851f429b822831bd2edcbe0cfd12ee9ea77868f8d3daf267b189371671c80e",
+                "sha256:c1fb0cda2abcc0ac62f64e2ea4b4e64c57dfd6b885e693095460c61bde7bb18e",
+                "sha256:c5ab0ee51f560d179b057555b4f601b7df909ed31312d301b99f8b9fc6028284",
+                "sha256:c70d9ec912802ecfd6cd390dadb34a9578b04f9bcb8e863d0a7598ba5e9e7ccc",
+                "sha256:c741107203954f6fc34d3066d213d0a0c40f7bb5aafd698fb39888af277c70d8",
+                "sha256:ca3f059f4ba485d90c8dc75cb5ca897e15325e4e609812ce57f896607c1c0867",
+                "sha256:caf51943715b12af827696ec395bfa68f090a4c1a1d2509eb4e2cb69abbbdb33",
+                "sha256:cb28c1f569f8d33b2b5dcd05d0e6ef7005d8639c54c2f0be824f05aedf715255",
+                "sha256:cdad4ea3b4513b475e027be79e5a0ceac8ee1c113a1a11e5edc3c30c29f964d8",
+                "sha256:cf47cfdabc2194a669dcf7a8dbba62e37a04c5041d2125fae0233b720da6f05c",
+                "sha256:d04cab0a54b9dba4d278fe955a1390da3cf71f57feb78ddc7cb67cbe0bd30323",
+                "sha256:d422b945683e409000c888e384546dbab9009bb92f7c0b456e217988cf316107",
+                "sha256:d80bf832ac7b1920ee29a426cdca335f96a2b5caa839811803e999b41ba9030d",
+                "sha256:da619979df60a940cd434084355c514c25cf8eb4cf9a508510682f6c851a4f7a",
+                "sha256:dafd4c44b74aa4bed4b250f1aed165b8ef5de743bcca3b88fc9619b6087093d2",
+                "sha256:dca83c498b4650a91efcf7b88d669b170256bf8017a5db6f3e06c2bf031f57e0",
+                "sha256:de2713f48c1ad57f89ac25b3cb7daed2156d8e822cf0eca9b96a6f990718cc41",
+                "sha256:de4ed93a8c91debfd5a047be327b7cc8b0cc6afe32a716bbbc4aedca9e2a83af",
+                "sha256:df52098cde6d5e02fa75c1f6244f07971773adb4a26625edd5c18fee906fa84d",
+                "sha256:dfbf280da5f876d0b00c81f26bedce274e72a678c28845453885a9b3c22ae632",
+                "sha256:e3730a48e5622e598293eee0762b09cff34dd3f271530f47b0894891281f051d",
+                "sha256:e5162afc9e0d1f9cae3b577d9c29ddbab3505ab39012cb794d94a005825bde21",
+                "sha256:e5d524d68a474a9688336045bbf76cb0def88549c1b2ad9dbfec1fb7cfbe9170",
+                "sha256:e99685fc95d386da368013e7fb4269dd39c30d99f812a8372d62f244f662709c",
+                "sha256:ea89a2458a1a75f87caabefe789c87539ea4e43b40f18cff526052e35bbb4fdf",
+                "sha256:ec671691e72dff75817386aa02d81e708b5a7ec0dec6669ec05213ff6b77e1bd",
+                "sha256:eed5ac260dd545fbc20da5f4f15e7efe36a55e0e7cf706e4ec005b491a9546a0",
+                "sha256:f14440b9573a6f76b4ee4770c13f0b5921f71dde3b6fcb8dabbefd13b7fe05d7",
+                "sha256:f405c93675d8d4c5ac87364bb38d06c988e11028a64b52a47158a355079661f3",
+                "sha256:f53ec51f9d24e9638a40cabb95078ade8c99251945dad8d57bf4aabe86ecee35",
+                "sha256:f61a9326f80ca59214d1cceb0a09bb2ece5b2563d4e0cd37bfd5515c28510674",
+                "sha256:f7bf2496fa563c046d05e4d232d7b7fd61346e2402052064b773e5c378bf6f73",
+                "sha256:fbaa70553ca116c77717f513e08815aec458e6b69a028d4028d403b3bc84ff37",
+                "sha256:fc3e55a7db08dc9a6ed5fb7103019d2c1a38a349ac41901f9f66d7f95750942f",
+                "sha256:fc921b96fa95a097add244da36a1d9e4f3039160d1d30f1b35837bf108c21136",
+                "sha256:fd0641abca296bc1a00183fe44f7fced8807ed49d501f188faa642d0e4975b83",
+                "sha256:feac1045b3327a45944e7dcbeb57530339f6b17baff154df51ef8b0da34c8c12",
+                "sha256:ff110acded3c22c033e637dd8896e411c7d3a11289b2edf041f86663dbc791e9"
            ],
            "markers": "python_version >= '3.9'",
-            "version": "==0.24.0"
+            "version": "==0.26.0"
        },
        "ruamel.yaml": {
            "hashes": [
-                "sha256:20c86ab29ac2153f80a428e1254a8adf686d3383df04490514ca3b79a362db58",
-                "sha256:30f22513ab2301b3d2b577adc121c6471f28734d3d9728581245f1e76468b4f1"
+                "sha256:710ff198bb53da66718c7db27eec4fbcc9aa6ca7204e4c1df2f282b6fe5eb6b2",
+                "sha256:7227b76aaec364df15936730efbf7d72b30c0b79b1d578bbb8e3dcb2d81f52b7"
            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.18.10"
+            "markers": "python_version >= '3.8'",
+            "version": "==0.18.14"
        },
        "ruamel.yaml.clib": {
            "hashes": [
-                "sha256:024cfe1fc7c7f4e1aff4a81e718109e13409767e4f871443cbff3dba3578203d",
-                "sha256:03d1162b6d1df1caa3a4bd27aa51ce17c9afc2046c31b0ad60a0a96ec22f8001",
-                "sha256:07238db9cbdf8fc1e9de2489a4f68474e70dffcb32232db7c08fa61ca0c7c462",
-                "sha256:09b055c05697b38ecacb7ac50bdab2240bfca1a0c4872b0fd309bb07dc9aa3a9",
-                "sha256:1707814f0d9791df063f8c19bb51b0d1278b8e9a2353abbb676c2f685dee6afe",
-                "sha256:1758ce7d8e1a29d23de54a16ae867abd370f01b5a69e1a3ba75223eaa3ca1a1b",
-                "sha256:184565012b60405d93838167f425713180b949e9d8dd0bbc7b49f074407c5a8b",
-                "sha256:1b617618914cb00bf5c34d4357c37aa15183fa229b24767259657746c9077615",
-                "sha256:1dc67314e7e1086c9fdf2680b7b6c2be1c0d8e3a8279f2e993ca2a7545fecf62",
-                "sha256:25ac8c08322002b06fa1d49d1646181f0b2c72f5cbc15a85e80b4c30a544bb15",
-                "sha256:25c515e350e5b739842fc3228d662413ef28f295791af5e5110b543cf0b57d9b",
-                "sha256:305889baa4043a09e5b76f8e2a51d4ffba44259f6b4c72dec8ca56207d9c6fe1",
-                "sha256:3213ece08ea033eb159ac52ae052a4899b56ecc124bb80020d9bbceeb50258e9",
-                "sha256:3f215c5daf6a9d7bbed4a0a4f760f3113b10e82ff4c5c44bec20a68c8014f675",
-                "sha256:46d378daaac94f454b3a0e3d8d78cafd78a026b1d71443f4966c696b48a6d899",
-                "sha256:4ecbf9c3e19f9562c7fdd462e8d18dd902a47ca046a2e64dba80699f0b6c09b7",
-                "sha256:53a300ed9cea38cf5a2a9b069058137c2ca1ce658a874b79baceb8f892f915a7",
-                "sha256:56f4252222c067b4ce51ae12cbac231bce32aee1d33fbfc9d17e5b8d6966c312",
-                "sha256:5c365d91c88390c8d0a8545df0b5857172824b1c604e867161e6b3d59a827eaa",
-                "sha256:700e4ebb569e59e16a976857c8798aee258dceac7c7d6b50cab63e080058df91",
-                "sha256:75e1ed13e1f9de23c5607fe6bd1aeaae21e523b32d83bb33918245361e9cc51b",
-                "sha256:77159f5d5b5c14f7c34073862a6b7d34944075d9f93e681638f6d753606c6ce6",
-                "sha256:7f67a1ee819dc4562d444bbafb135832b0b909f81cc90f7aa00260968c9ca1b3",
-                "sha256:840f0c7f194986a63d2c2465ca63af8ccbbc90ab1c6001b1978f05119b5e7334",
-                "sha256:84b554931e932c46f94ab306913ad7e11bba988104c5cff26d90d03f68258cd5",
-                "sha256:87ea5ff66d8064301a154b3933ae406b0863402a799b16e4a1d24d9fbbcbe0d3",
-                "sha256:955eae71ac26c1ab35924203fda6220f84dce57d6d7884f189743e2abe3a9fbe",
-                "sha256:a1a45e0bb052edf6a1d3a93baef85319733a888363938e1fc9924cb00c8df24c",
-                "sha256:a5aa27bad2bb83670b71683aae140a1f52b0857a2deff56ad3f6c13a017a26ed",
-                "sha256:a6a9ffd280b71ad062eae53ac1659ad86a17f59a0fdc7699fd9be40525153337",
-                "sha256:a75879bacf2c987c003368cf14bed0ffe99e8e85acfa6c0bfffc21a090f16880",
-                "sha256:aa2267c6a303eb483de8d02db2871afb5c5fc15618d894300b88958f729ad74f",
-                "sha256:aab7fd643f71d7946f2ee58cc88c9b7bfc97debd71dcc93e03e2d174628e7e2d",
-                "sha256:b16420e621d26fdfa949a8b4b47ade8810c56002f5389970db4ddda51dbff248",
-                "sha256:b42169467c42b692c19cf539c38d4602069d8c1505e97b86387fcf7afb766e1d",
-                "sha256:bba64af9fa9cebe325a62fa398760f5c7206b215201b0ec825005f1b18b9bccf",
-                "sha256:beb2e0404003de9a4cab9753a8805a8fe9320ee6673136ed7f04255fe60bb512",
-                "sha256:bef08cd86169d9eafb3ccb0a39edb11d8e25f3dae2b28f5c52fd997521133069",
-                "sha256:c2a72e9109ea74e511e29032f3b670835f8a59bbdc9ce692c5b4ed91ccf1eedb",
-                "sha256:c58ecd827313af6864893e7af0a3bb85fd529f862b6adbefe14643947cfe2942",
-                "sha256:c69212f63169ec1cfc9bb44723bf2917cbbd8f6191a00ef3410f5a7fe300722d",
-                "sha256:cabddb8d8ead485e255fe80429f833172b4cadf99274db39abc080e068cbcc31",
-                "sha256:d176b57452ab5b7028ac47e7b3cf644bcfdc8cacfecf7e71759f7f51a59e5c92",
-                "sha256:da09ad1c359a728e112d60116f626cc9f29730ff3e0e7db72b9a2dbc2e4beed5",
-                "sha256:e2b4c44b60eadec492926a7270abb100ef9f72798e18743939bdbf037aab8c28",
-                "sha256:e79e5db08739731b0ce4850bed599235d601701d5694c36570a99a0c5ca41a9d",
-                "sha256:ebc06178e8821efc9692ea7544aa5644217358490145629914d8020042c24aa1",
-                "sha256:edaef1c1200c4b4cb914583150dcaa3bc30e592e907c01117c08b13a07255ec2",
-                "sha256:f481f16baec5290e45aebdc2a5168ebc6d35189ae6fea7a58787613a25f6e875",
-                "sha256:fff3573c2db359f091e1589c3d7c5fc2f86f5bdb6f24252c2d8e539d4e45f412"
+                "sha256:040ae85536960525ea62868b642bdb0c2cc6021c9f9d507810c0c604e66f5a7b",
+                "sha256:0467c5965282c62203273b838ae77c0d29d7638c8a4e3a1c8bdd3602c10904e4",
+                "sha256:0b7e75b4965e1d4690e93021adfcecccbca7d61c7bddd8e22406ef2ff20d74ef",
+                "sha256:11f891336688faf5156a36293a9c362bdc7c88f03a8a027c2c1d8e0bcde998e5",
+                "sha256:1492a6051dab8d912fc2adeef0e8c72216b24d57bd896ea607cb90bb0c4981d3",
+                "sha256:20b0f8dc160ba83b6dcc0e256846e1a02d044e13f7ea74a3d1d56ede4e48c632",
+                "sha256:22353049ba4181685023b25b5b51a574bce33e7f51c759371a7422dcae5402a6",
+                "sha256:2c59aa6170b990d8d2719323e628aaf36f3bfbc1c26279c0eeeb24d05d2d11c7",
+                "sha256:32621c177bbf782ca5a18ba4d7af0f1082a3f6e517ac2a18b3974d4edf349680",
+                "sha256:3bc2a80e6420ca8b7d3590791e2dfc709c88ab9152c00eeb511c9875ce5778bf",
+                "sha256:3eac5a91891ceb88138c113f9db04f3cebdae277f5d44eaa3651a4f573e6a5da",
+                "sha256:4a6679521a58256a90b0d89e03992c15144c5f3858f40d7c18886023d7943db6",
+                "sha256:4c8c5d82f50bb53986a5e02d1b3092b03622c02c2eb78e29bec33fd9593bae1a",
+                "sha256:4f6f3eac23941b32afccc23081e1f50612bdbe4e982012ef4f5797986828cd01",
+                "sha256:5a0e060aace4c24dcaf71023bbd7d42674e3b230f7e7b97317baf1e953e5b519",
+                "sha256:6442cb36270b3afb1b4951f060eccca1ce49f3d087ca1ca4563a6eb479cb3de6",
+                "sha256:6c8fbb13ec503f99a91901ab46e0b07ae7941cd527393187039aec586fdfd36f",
+                "sha256:749c16fcc4a2b09f28843cda5a193e0283e47454b63ec4b81eaa2242f50e4ccd",
+                "sha256:7dd5adc8b930b12c8fc5b99e2d535a09889941aa0d0bd06f4749e9a9397c71d2",
+                "sha256:811ea1594b8a0fb466172c384267a4e5e367298af6b228931f273b111f17ef52",
+                "sha256:932205970b9f9991b34f55136be327501903f7c66830e9760a8ffb15b07f05cd",
+                "sha256:943f32bc9dedb3abff9879edc134901df92cfce2c3d5c9348f172f62eb2d771d",
+                "sha256:95c3829bb364fdb8e0332c9931ecf57d9be3519241323c5274bd82f709cebc0c",
+                "sha256:96777d473c05ee3e5e3c3e999f5d23c6f4ec5b0c38c098b3a5229085f74236c6",
+                "sha256:a274fb2cb086c7a3dea4322ec27f4cb5cc4b6298adb583ab0e211a4682f241eb",
+                "sha256:a52d48f4e7bf9005e8f0a89209bf9a73f7190ddf0489eee5eb51377385f59f2a",
+                "sha256:a606ef75a60ecf3d924613892cc603b154178ee25abb3055db5062da811fd969",
+                "sha256:ab007f2f5a87bd08ab1499bdf96f3d5c6ad4dcfa364884cb4549aa0154b13a28",
+                "sha256:b82a7c94a498853aa0b272fd5bc67f29008da798d4f93a2f9f289feb8426a58d",
+                "sha256:bb43a269eb827806502c7c8efb7ae7e9e9d0573257a46e8e952f4d4caba4f31e",
+                "sha256:bc5f1e1c28e966d61d2519f2a3d451ba989f9ea0f2307de7bc45baa526de9e45",
+                "sha256:bd0a08f0bab19093c54e18a14a10b4322e1eacc5217056f3c063bd2f59853ce4",
+                "sha256:beffaed67936fbbeffd10966a4eb53c402fafd3d6833770516bf7314bc6ffa12",
+                "sha256:bf165fef1f223beae7333275156ab2022cffe255dcc51c27f066b4370da81e31",
+                "sha256:cf12567a7b565cbf65d438dec6cfbe2917d3c1bdddfce84a9930b7d35ea59642",
+                "sha256:d84318609196d6bd6da0edfa25cedfbabd8dbde5140a0a23af29ad4b8f91fb1e",
+                "sha256:d85252669dc32f98ebcd5d36768f5d4faeaeaa2d655ac0473be490ecdae3c285",
+                "sha256:e143ada795c341b56de9418c58d028989093ee611aa27ffb9b7f609c00d813ed",
+                "sha256:e188d2699864c11c36cdfdada94d781fd5d6b0071cd9c427bceb08ad3d7c70e1",
+                "sha256:e2f1c3765db32be59d18ab3953f43ab62a761327aafc1594a2a1fbe038b8b8a7",
+                "sha256:e5b8daf27af0b90da7bb903a876477a9e6d7270be6146906b276605997c7e9a3",
+                "sha256:e7e3736715fbf53e9be2a79eb4db68e4ed857017344d697e8b9749444ae57475",
+                "sha256:e8c4ebfcfd57177b572e2040777b8abc537cdef58a2120e830124946aa9b42c5",
+                "sha256:f66efbc1caa63c088dead1c4170d148eabc9b80d95fb75b6c92ac0aad2437d76",
+                "sha256:fc4b630cd3fa2cf7fce38afa91d7cfe844a9f75d7f0f36393fa98815e911d987",
+                "sha256:fd5415dded15c3822597455bc02bcd66e81ef8b7a48cb71a33628fc9fdde39df"
            ],
-            "markers": "python_version < '3.13' and platform_python_implementation == 'CPython'",
-            "version": "==0.2.8"
+            "markers": "python_version >= '3.9'",
+            "version": "==0.2.12"
        },
        "subprocess-tee": {
            "hashes": [
@ -663,27 +659,27 @@
        },
        "wcmatch": {
            "hashes": [
-                "sha256:0dd927072d03c0a6527a20d2e6ad5ba8d0380e60870c383bc533b71744df7b7a",
-                "sha256:e72f0de09bba6a04e0de70937b0cf06e55f36f37b3deb422dfaf854b867b840a"
+                "sha256:5848ace7dbb0476e5e55ab63c6bbd529745089343427caa5537f230cc01beb8a",
+                "sha256:f11f94208c8c8484a16f4f48638a85d771d9513f4ab3f37595978801cb9465af"
            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==10.0"
+            "markers": "python_version >= '3.9'",
+            "version": "==10.1"
        },
        "yamllint": {
            "hashes": [
-                "sha256:c03ab4e79ab4af964c8eb16ac9746880fc76a3bb0ffb14925b9a55220ae7dda0",
-                "sha256:ead81921d4d87216b2528b7a055664708f9fb8267beb0c427cb706ac6ab93580"
+                "sha256:364f0d79e81409f591e323725e6a9f4504c8699ddf2d7263d8d2b539cd66a583",
+                "sha256:81f7c0c5559becc8049470d86046b36e96113637bcbe4753ecef06977c00245d"
            ],
            "markers": "python_version >= '3.9'",
-            "version": "==1.37.0"
+            "version": "==1.37.1"
        },
        "zipp": {
            "hashes": [
-                "sha256:2c9958f6430a2040341a52eb608ed6dd93ef4392e02ffe219417c1b28b5dd1f4",
-                "sha256:ac1bbe05fd2991f160ebce24ffbac5f6d11d83dc90891255885223d42b3cd931"
+                "sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e",
+                "sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166"
            ],
            "markers": "python_version >= '3.9'",
-            "version": "==3.21.0"
+            "version": "==3.23.0"
        }
    },
    "develop": {}
--- a/host_vars/web22
+++ b/host_vars/web22
@ -1,141 +1,141 @@
 $ANSIBLE_VAULT;1.1;AES256
-64313136396662396631396561646634386134313337316166376264346466386533383934393130
-6339663736653462613737323932396664643132383036370a343032653931343063326337626336
-38383332346637633636663865333031636166643161323335363663653033646234656332333462
-3833643037313134320a613332303261356363363138636138323661633233353365623665663632
-30616166383161663534666337303632663532343866366261393935373935666536616530373862
-66653836393966346463393061646431336666316537613364643939663938303135386463616661
-31633330663364353663646338386338323039646530373165386663646235303963623837646533
-30316236313736303837353536633161326564643566643533363431303130376338383034623365
-34303861356264333463613739373635616363366362333738383838326162313238313966313765
-35356637623833663437373765333237323961383133336161363439316632363634623734373962
-32326466303536363164666532313264343661336364396562383630653865316132366538313066
-65666661343632383434346639353462623735373933303263613938363635353666656139663832
-66333638636136393166636332623934613938656336663431323032333339336165366664636334
-65363166616462303939383838363363623530313539386635313664333136643035623262663333
-35643335346639623363323535633735613965333133323639383339323166366635303536376265
-35613939376135393165653466366462656162353632393139376666666334386166366162643438
-31313033353661313031303961313032613539396561303734356533373234633233613465306431
-31303332643931333037343164643162663738393466346639306632306534613065376138323564
-31326462666336633938396230666231356439343630336132313064363636333563373637313666
-32303230616235653733323032343238303230396232623364643765613764336137646630363462
-64343239343530636333663764643338623630366163636232353734616333306339626136313338
-35616632326436663734376263366437356236343339663430323632646136373066373961666135
-38313838316266313830626234366262383037646661386537663534633263633239306461346535
-32643032316266373931346232356162336437623137623365616132643731666361313637316536
-39656332383466346236633461366437386538373734646337393666346562323139663734326436
-65623633363266323563666437633666326363626561313133633031623632633333346332623334
-31396365333336313939633161613639383963633136616562333236636666306139663430363265
-63353261306332346439313534393363626638633531633532363365663265353331336231316238
-37323439383930346136383036303833316565306139613235333633373832313130316534666435
-30323262623037623939336265303866356532653064303436653131633162616630326362616430
-33343538353139326663653735343436623834653264376264363761313835376433653531623266
-34386266613733653634363135616335303138303062316664623666643263323939643939303133
-32393564323833666132626664646436333733396565623164646363343065343464363465383330
-33636562613734303665343366656630303732323739363339306337316266356635323262643031
-63393261363764613638666231663837373263353137643265336134646364343130353237336463
-62306363373339363235343034393230623035373366656531666663323936323366643938646135
-62643135383734663766353230356463373337613936633037396538643365393738363234313166
-62303038326236656332663939333364633132386266383665363632386235643731616631313431
-37613566616463613662633734316461386261646464636539353439373431323133663435333763
-63333230663431323136373564613239386531356463646366313537303861616234626561663133
-32643134666337633938633530323034653131663663643732623636633834323064633832396339
-35613738366666653765333434616336383635323765626561376232363062373761383665313735
-30643165633930656566633339383439353931303836333537343634353434653433333933386338
-64393566616166353731313261386239646531316563623363646537653964366631663266353366
-65666638393337663633366132663933376135396334303461653232353765626365303464626338
-30653334393439373632393662653032633264363238626431326136653561636164646237373033
-32646464616137366163313634623864656666346336383037373562633333633432313439323631
-34646132643834323261316166303531666238333964396165313936393937366533396436633832
-34663538613139623063346666306165306530646363353732353431343831303161343535623539
-38663537323132653034393335623232623530343432336531643538356430636262313132356430
-33363062333931306633643733313239373934313635336465643139616266613237353166626334
-35643138633561393531313835623665303531313437323664616561633764316332393435373065
-38633766623633666362633336326466343938623461393736666137313965386133396433303236
-34366339326637323934323236346239373565623565313433376433303061353763383732663239
-65313636646539623037653761316662303565636262376262333332316136623737613338303036
-37623837313636333464626664323163633136343762306462323339646535636237326138613132
-33613761646237396265616135346639636566316633646165616332656333383233343836316163
-36313736343263343534656533646463343933333031666433393635623461633639356430303434
-34663033333933333439386532623664316364343066646232353335643536353733326165623231
-66306661343939616235313238353761643034623062326632393161336462333365636536343934
-63343866666237636563363561366339623161643362326632333532613562336238653562346231
-33623337386233636331326232393465346362336439303336303638643430623864323434633333
-63623036623764646234636433383364333763613866626230316533643535356662306136346664
-36353734663866306336303439623537336266383131303365383439356462306237363030306432
-38623738643434396138373837386334616435383662363032663930363038666536653334613261
-36623730666333393564346539653533656434346439346632643730356665313865396463343737
-31326633646661666461396365643061333361643638363835343235646231633637616464343265
-36646439383737336531303236666136313063653563653433306563643362353536663863653266
-38613461363432333666343264333461396461653231646133383861363763353763626334373635
-35313431346465336636363531363766633234653066376366636263306238393361343936663066
-61653739303230316232626335383865636235363638663463396435623737616661346666613037
-32666436333937356530326566626237303065363834313837383837306432383833643632376564
-39623937653631656562306565376232333463626563336630633331663764346138323466303433
-38303965386635386565653035666631616239306231616530363965306134633034623936396135
-32366430333763333039613734343563663065636538616139646239303533336437616162366532
-38343137366563333866343537393532353835386230623536663966643730663031636639313232
-33636133303432343531626539633862646466653864393737363333366238666536303663343837
-39363330383432353465633132346165333564646262383736366664303239366365643533353738
-65656163313966306464633237383530316338666665666236656164636433653735353739393363
-30633462393933646436356365323864383239633963306366356534333036663438643438303365
-37366638383066653965383764323436336230363336303233303433656563656563343630613935
-64373965366662323137353631323233643463366338393639663833633635313531616539366333
-30656663666561353938393761353266386533383361326439383338363762633538396638386630
-31383131316137346234336462333032366337393438343237613231323164306132373136323233
-38643133356166303661363761646430363734373130363334376535356565386638366630306362
-63626539336134356539366166616331626361356335616665336564636638316137316230643961
-65623465336232326533616538653561646263626536333738346531366661336134366362386239
-39643665663566376264356332653062313536353635656231656566386333636330353765373664
-34616338623161333232653832386436343361636461653338363932633337623537303261396334
-30386663613335303438376234333138363432633234646133646466323930656330623161373530
-36383261373139663932623933626164313765613930323035326334373231303033616665346337
-32353235663465336433666539333032376365373266363436353063366139616232373037383664
-31323062383063373932623030356461353039326363336165326138353335326436363165393639
-33643830353734616164653833613830333066626161636130323861643866386234383136313336
-37333337363462313831633437636633383137303736303264393236333633383933303939383533
-38626138396537663463633961303766663636353737336365393638383832303735323266646337
-62643665353431326465386162633737613935353261633963616531306233613966643862316166
-38316164383433333263363630386462313639336464653061373239633235346633613237646563
-62383836393063613365653635663136356538623962623961326434646635633464313932626333
-36383666653264366236396638626265356338653630303930383861386534393732633437363663
-38623739313131643038396335326437323231636661346164353433303235356432306532353066
-63373662313366376363653039316361366266616466663663313732303962336339616235366432
-32643832366231396132333236313962313932343230333832616664356333646533323732656466
-34393862393434383362303531653638303366323530656661623236336630383064663135373862
-61313761643038333035376535633964303564616532646139393964353165353763626235303662
-65633465626365393033376437633134333532656262366462323365653466616462316664323837
-64346533366238656637366665303339666433623261623635383631303862616438353166353866
-66346366316562316230306233323937313364656537393063306537353237353737626164663365
-38636331363138326336646434653238636463633138343134373937373835373232356363663366
-37386633353439656162613736303932633333313131653364616364343761363335343430396432
-39636630343066616633376237643062616666666135363232376632666132396333363334623036
-63323531626632383062353162346536663233656132383734643761396264623165663738616564
-61316234386135656538363861363531373232303163643364366136616130643737346438353334
-63653234376562663937663135363763656236346663363738313836383466656162643131636138
-63383430653030383232333830656333373765333639303265643938323833613262643863643835
-66326466313730323666643939623539326639663838663737326665326164366262323731623037
-33383631616530383238626431333033366134383839613761656264366331663539363131396361
-64316333373134636163666634656561306130616337383030653063626161303930653730623130
-33653730656332616135663631653336386166363866303932643163353963396466646662626439
-39653562613461353633313533356336393334643066626137306164643530343331666430636330
-63613763336663613639343036363332626232346530366633646536396338613164666163663235
-37333334313436326233653866316438626366633632653336393633333931353961353132376639
-66343362646630376537356638396263623262363138323630363834386162656236313365393766
-39616135303337303166313663383635636165373333313463623731346561356430326164663164
-30333839386564616133393630396538633032616332646639616161643739626437306532356136
-34383432626136336261666166633739313663333664663035333533626334623132373037663239
-38393638323833643730353432656365396161353161613733653562303731616462623436643832
-35376133653665333432303132383966333362313262393931373264616664643438346566333764
-34303439633538376439646435646631336361316436306330653838363665366461333366656239
-33303038643139643431613764333864306134666166376164623038333330613933333766643830
-30653637666533363234626465353734303538623233623532393936303566306434346537343932
-39393863373635626530326139376339653764623265636530323330376633363265636439353738
-32353634316162656461353666666338633233393039343935613539623766363237656161383364
-61356165313637343134363932333136643464353436323333653939613666653164303363656637
-32386561326461353665633339373038616464633430303763666234313032653735373832393539
-33333334663336346139373064633364353530366166636465343734633465623065666563383539
-30316166356239316530633239313765623438306234666235616464313765356165363435303336
-39633532393965646539356439396132616637383430653762616562323065343233383034363130
-32623331343035306165313637356131633963353035313838363439343133636631626532613366
-33323364616262303962
+61623539626162633765633037643066613863623631336534396535353439376238646263306463
+3762323765316137356636623430333662386564626536350a333334393630653733353864636162
+64623562623462373337363339343832336439363832653666316335313633343663396438346365
+6531343731363736340a373839663837396138366237303636326363663366656564306663663934
+34333862643232383566306335363462653035313039353764643261663165613861623333663136
+31333131303630356239636334346466643433356661383234383132653865326634643138613666
+35386430646239643535373264386535316135623633303863646564313538323532333739653636
+37393833363564323533333963376334326536666535626530383165613938353232356539633732
+30633761336638636265353764643063316538353065376431616165343936323834303733326433
+62626233643630643835323834343461333365333232373236376234376532636431396232633034
+34303538313331383332643731653634313736383261393563393232643466386339363836623466
+33383633353239623930363765326638643066373332653264633437323536366233383030346135
+61353636353239376564396336353538616135663237613137366263353730366263643961373461
+36646132646563646133373563653034646330653931396562643832666634383439313764646535
+35643161356263316638363662626662346232633230363731633263333566376262396236363161
+38636138306366666163663861346639323630663039353863346161613336363730633738386635
+31356638623938353964346436353565363431636238326266373863316464396563336461336162
+37323962343637626634386539643062343565313431386265323166623437346639363630343739
+63613738656465346261653538643932666235356635346564356234613265353761393263373965
+37326438346432306165616538363334653732643138643864633731363936626433303961373465
+38383535396665643037363665623739346230666539643835343862646464303436303561313035
+31356462656230326137616531363461316365333432326230373632356632313765333464313164
+65393537656364656464343237646137396331643165343639643330353264333066633432363066
+31336132373162393033363636386632313938333039393533313038623633613362646134363162
+36346532306166346335643636353439323732663763396432613537316234376366616262626638
+38613936626237343464373937383464356439383934353264643632386239353666396133656635
+37666534383461663433653139383732383062643939653066656231646532666262386239616433
+34386335363663313933663465623534633163316635353439616532386565613234373039653364
+62376565613863656232643631343634636366643034386466323963643837653831653635333865
+37383834626362613235623264613234653236323236383632356666643465313561626137343330
+61643963306363366638306335653364616264613766346539316337623466666537616535333363
+35306665383339643834616463396362663538303031386639343932346537363866663536373634
+32623738363234326361336436626330363962316163653733663663316139393134666632633438
+32303463343363383663636165643730653138356538326137613730383863373635646533373066
+38323361373665376435313266373439636533646634326533626135313462303739313430383730
+32333636633737376566623663323234376235623039313865663232323761616532666466306264
+39623434333638323065623830656535353331326435643464333035326338366136666136663337
+34336366333539333232653263396231633234313935396366646639383465326333653236383362
+36656563653465346439653230333534656530373766653733373765623234336466663631323765
+38636262373831393633343262356538393736666134633264353037383033343436346333306565
+38663637333062653565666163616330393637616434666634633839373966373666323831353338
+33666235646162343234343336356563663430643035306333623136323461636135386238396137
+63323830316634653666333735663533336262303931653666356531343464656132326134313831
+30666466373833313331316330353539646534333135373364343066643536636335633264306334
+63396133626234323734666162343835613436393763303836383839323338323339313261383033
+33616430376436663966626230343436643032353636363765303032333637396531623265393064
+62336330396533346462313638613262363435306330366561303336316239313731623562316366
+36373864373763383236663163363335373435636431613562373334396432323633373063346564
+38616637316162396638356234323436383765663036366363323964613264373638656161393661
+38623234356137383936303738306263376632393533613739613636613561333262333537616336
+35393739636533373865343533633961316137626337363336316333616162643538343362613634
+34376334393134643963383634646432643763316232656135663031373361346332636662653266
+38663931663239666462626664373064666366613834623033346133306335333462623931646535
+65343966313966386632333133363965623436313237343331366565323133343833623232326337
+38363234336137633035333362383164656238326434366330336662653435343639663438613062
+30346336353964346362393832653835303730383934316563333538376333353830376661313065
+31353837333563363561663931386264346263323665616231383538353937393330303163306433
+64376662393464643836636162373564376664306161656539626132313232343861396537386462
+32376636333564323137623862396135313863306337346131323834396633333261633438646561
+31613734343839373735356464643865663061363338346663353932313635393138613538303463
+33373333373230383336336462636333353137303563366234363737343437323336386335633739
+61363266633065383738336537346331376663313133393761633530633932643739636238633565
+33343236633834383933336466636663383566633932643464353665643733613137633538346437
+33366361663537343931653537333737633463336135623836373261663538303532633763646432
+39343361383335636433666431616363373161646265393231353265393436633238303066613963
+39633765663339643864386334613337666138333538333762353866333464386232396530306335
+64306461363730313061633831343839613065313061326132613563666563656131383236623032
+33346234333966653732643263313138333262343461623736386334356662383536633062653832
+37626132376336643563396561626636346237393138343133656565643631646530326166613061
+31353863623430656433356636616636303961336262613063616464313832343030333937356662
+61353136633539306265386335393035313864366464303131663337383636363431636537646461
+37646431643862646262623038336635653764383165376433666639363337623035616562663561
+36613165393931336639306662656136663231316530663266666135353461613538653734316661
+36363065663261323439653733336266613539363732323230346433353363333637616635666234
+36373439343762336161313965396537363332316561303235666264653038353132633561393038
+30373366303136656661353664396261393136623436323930666430636435623362396636646161
+63613734663964656139393531316465623130666663376266616137316137616233373630396663
+32326166663731643837623262393835656532393139396535393732626164316136626239663230
+35326166346162626134626566313963333661643531353437666139396333343335306633643531
+63386437646536633430643539623164306139316364646136306366373732373065376561303431
+65363237353163656162393264316263303366633630303532623130343066636132613865363662
+63323233323064633238356236616665373933626465393032326134363434613262653165343166
+38313263376637383163336565376538326532353766626264346536353563663464623737653430
+66373866343865326331333833353261386132393234303536353864343934353039323038363630
+37373632356461633137336230353762316562353430323761623861343639393030653038313632
+66636133643566306432333038623866333531613334396432306666316439366435383661336531
+36373333623266353461383431333462343037306563616231663563353833653839313538613631
+30646130383932343865363062313836323365616639346537663461343164363934653737613466
+38326234356261343764323063613366313633313766613736663033666664613433363438646366
+64366333373164333838363934636366336430343032316562653137323634303833616363393063
+35343330663434356530333535663664336463396533393564663138623162666563323736366135
+63653662306265326238363266393864393630333064303861376432333432386262306363336135
+32333762333339383662303931376631326638666635353433636461386264633166313336636663
+36313336663730363937316539623132313937633032396462616634346630383937353034343332
+32346164363362346264353965633761306163343131323661313836636438646337396238653962
+66306666366663343731333338666463313139373033306137643631313930353932616339636337
+39363337376232616139663863303430353530643964633333376561326339373334663862383230
+37613861373836643762386339666434623931376266643361383761373235393035303137613838
+39383230393831373836396435323734316332663465376136333365393433633065666565393033
+62356661346433643532633366313132313137623134626431343532373461396462653738613030
+39323566326239383434616663626330646136386463646331616431386235633435333838363732
+33633063363065343032383736643634313034663632373237663132373561656530396661326366
+31313738633662616663646163386461336537313236313930336466346161306535373965366137
+32383934626563663033356466653162333732633639363563663464353466383233373830633361
+37326531636262313337333665626233303263633461356331343261353838396661656138323130
+39316634666432656638623733333531303662613062323430333933626264376138393665363964
+62633765313262653165393332336539363263636362383262303766373331353363363564333037
+39373164633563303461313830383632623438666333333938613066313562623233353665653631
+62313634373537356365633065333763333533313730353235363963643131316364323031643235
+64313731343735346533646430346565393365363334626563353030313663363930363966313339
+34346130626633333239663935376663393962363761663935303639346333326230363730363366
+39313230353130373733396264616530303534383466633231303661663635623266346235363163
+61383761623039666462383266666565643930303664616432393434666566636437616536626365
+33336366333139633138386366333938343630373965613865663830366333363363303565633238
+32313762303739356433383534653966376231316366396333616435343539376432633837666635
+31396137373263386365616237396232376664653266663562356533613263323131356266666264
+36636266623338323861303237623361666130373938306539343438316662326536376438306465
+62656463356364363837353738663539316163346565333431343363303564376436666631383435
+65333066383335633462613034383139336262393865383534323032323730343865303339343239
+62343962363566643566356433623133333363343535376534333938623033656334613432326533
+63666339373135353331326363303064666137383439663738373236623137383562346439356432
+62383365373063376637313437346333643637376234376434613666353734333039353463313335
+32326564343139383035313261646635313939366531323530393434303735306138633435333037
+65666533366634666665393838616533656338353938333437363939616435636538313937303631
+32663439396165333633653531353835366436323062326535366432313936323031613639633164
+66323234613139626433326130396232366231623135366462393366616365653337346261663836
+61386435636361336334333235663865343262633333633162376433383062336663396162303133
+32666437336634323132396664373930316365626131646636366632616138626366613737616131
+64386439386265373631373232626538323936383162333535383134643438336336636435613033
+31336139376434316432343139363464616136626463396534646239646633363164646330373161
+31663233393234393837356133316462346563303435663262363532333963333535373031656434
+64303262633166346534396166643365326262636431353065613236666463336238633838633636
+35356265653935663963343737616563373663376239613436663138386566393438323735393362
+32616238623538366639373762336363353638306539336263316338323666303866633935386433
+62313865303732613266393066386533313263313432356434363734626365643338646438646633
+31346463313236643862303034363737343731343934666632623130613932323137376134653265
+35326164303031623235303265613765663263663333353066333633663636323635383832373865
+35626135333634346637346537373962646236376431393266306436333634646263646266326234
+37383037363364306230646334333532613464353931376338366532326134393437303535393033
+34316232326462343662
--- a/roles/common/files/update-firehol-nftables.service
+++ b/roles/common/files/update-firehol-nftables.service
@ -1,10 +1,7 @@
 [Unit]
 Description=Update FireHOL lists
-# This service will fail if nftables is not running so we use Requires to make
-# sure that nftables is started.
-Requires=nftables.service
-# Make sure the network is up and nftables is started
-After=network-online.target nftables.service
+# Make sure the network is up
+After=network-online.target
 Wants=network-online.target update-firehol-nftables.timer

 [Service]
--- a/roles/common/templates/etc/systemd/system/fail2ban.service.d/override.conf.j2
+++ b/roles/common/templates/etc/systemd/system/fail2ban.service.d/override.conf.j2
@ -1,3 +1,7 @@
+[Unit]
+# If nftables is stopped or restarted, propagate to fail2ban as well
+PartOf=nftables.service
+
 [Service]
 PrivateDevices=yes
 PrivateTmp=yes
--- a/roles/common/templates/update-firehol-nftables.sh.j2
+++ b/roles/common/templates/update-firehol-nftables.sh.j2
@ -58,8 +58,8 @@ NFT_HEAD
    rm -f "$firehol_level1_ipv4_list_temp" "$firehol_level1_ipv4_set_temp"
 fi

-echo "Reloading nftables"
+echo "Restarting nftables"

-/usr/bin/systemctl reload nftables.service
+/usr/bin/systemctl restart nftables.service

 rm -v firehol_level1.netset
Author	SHA1	Message	Date
Alan Orth	00558c7dea	roles/common: re-work fail2ban and nftables Re-work the fail2ban and nftables interaction. Use systemd's PartOf to indicate that fail2ban is part of the nftables service, which tells systemd to propogate stop/start signals to it. Then we tell the firehol update script to restart nftables instead of reload. The different between restart and reload is meaningless for nftables but we want systemd to propagate the stop/start signals to fail2ban.	2025-07-08 10:39:17 +03:00
Alan Orth	c927186837	roles/common: adjust update-firehol-nftables.service This service does not actually depend on nftables, at least not in the systemd sense of dependency. Furthermore, this hard dependency was causing the service to fail when it restarts nftables at the end, which causes systemd to start it again and again until it hits a restarting too quickly error.	2025-07-08 10:37:39 +03:00
Alan Orth	690774c862	host_vars/web22: WordPress 6.8.1	2025-07-08 10:34:34 +03:00
Alan Orth	cc021bd14a	Pipfile.lock: run pipenv update	2025-07-08 10:25:09 +03:00