diff --git a/secdep.py b/secdep.py index e09fe93..6f6fd72 100755 --- a/secdep.py +++ b/secdep.py @@ -237,84 +237,55 @@ def update_env_file(): get_env_vars() AWS_ubuntu22_04_images = { - # "af-south-1": "ami-0e464b219a424deaf", - # "ap-east-1": "ami-0bc44b8dc7cae9c34", "ap-northeast-1": "ami-0cd7ad8676931d727", "ap-south-1": "ami-06984ea821ac0a879", "ca-central-1": "ami-0dae3a932d090b3de", "eu-central-1": "ami-03e08697c325f02ab", "eu-north-1": "ami-00c70b245f5354c0a", - # "eu-south-1": "ami-04f5f6ddf256cb634", "eu-west-1": "ami-0333305f9719618c7", - # "me-central-1": "ami-0242106c866413fc8", - # "me-south-1": "ami-0a1fdc43b81c7158b", "sa-east-1": "ami-015e30624fffff117", "us-east-1": "ami-00874d747dde814fa", "us-west-1": "ami-09b2a1e33ce552e68", - # "us-gov-east-1": "ami-0efd49eddc5639cc5", - # "us-gov-west-1": "ami-061efa908c09c5409", "ap-northeast-2": "ami-09eba584c30b7299f", - # "ap-south-2": "ami-063b634d62a631728", "ap-southeast-2": "ami-0c18f3cdeea1c220d", - # "eu-central-2": "ami-093264efdd8abd77a", - # "eu-south-2": "ami-0e2cc458bd7bcef78", "eu-west-2": "ami-0d09654d0a20d3ae2", "us-east-2": "ami-0ab0629dba5ae551d", "us-west-2": "ami-095413544ce52437d", "ap-northeast-3": "ami-0ead712799090892e", - # "ap-southeast-3": "ami-093bbf368c0fe38fe", "eu-west-3": "ami-0afd55c0c8a52973a" } AWS_ubuntu22_10_images = { - # "af-south-1": "ami-0eb79b9557c227d8b", - # "ap-east-1": "ami-0649ce955b9ae6a6c", "ap-northeast-1": "ami-04e096919731466e4", "ap-south-1": "ami-01b60efb0632e8b18", "ap-southeast-1": "ami-085ecfe4d567e153a", "ca-central-1": "ami-010346a896f698f7d", "eu-central-1": "ami-0f1cf34dcb4057a5f", "eu-north-1": "ami-0e942149c97ff88bd", - # "eu-south-1": "ami-001081dd6e3c2cd7f", "eu-west-1": "ami-015423a987dafce81", - # "me-central-1": "ami-06e1d0e6cc8c23f9e", - # "me-south-1": "ami-0ceb0cbe999a08ab4", "sa-east-1": "ami-06edb0fb80530aa8b", "us-east-1": "ami-074f5b0bdbdc43210", "us-west-1": "ami-0eb5f373317fb0ae4", "ap-northeast-2": "ami-05493e234687bd083", - # "ap-south-2": "ami-0f672f06263d4cac9", "ap-southeast-2": "ami-0bd29331dcb023a43", - # "eu-central-2": "ami-068fda3bce227e2ed", - # "eu-south-2": "ami-03f876aeda1da1eba", "eu-west-2": "ami-0ae7948375d66d902", "us-east-2": "ami-0de381f43eb6dbe39", "us-west-2": "ami-0534f435d9dd0ece4", "ap-northeast-3": "ami-05ede9a3a46934154", - # "ap-southeast-3": "ami-00b6bff126cff8ea4", "eu-west-3": "ami-0545575c963ed1276" } AWS_debian_10_images = { - # "af-south-1": "ami-0fca764f342bb4e75", - # "ap-east-1": "ami-0e1391d32ca6645e5", "ap-northeast-1": "ami-041e370f47f9b619e", "ap-northeast-2": "ami-0243bb2bec2d9707b", "ap-northeast-3": "ami-0c1c0379b3534e7d8", "ap-south-1": "ami-0eb2c4104acb437b2", - # "ap-south-2": "ami-0b87809e702026b3d", "ap-southeast-1": "ami-0ee39036464b9a87e", "ap-southeast-2": "ami-0bb99834ae8c7471e", - # "ap-southeast-3": "ami-051fb80fedf8626d4", "ca-central-1": "ami-0125327537ef16282", "eu-central-1": "ami-0c984d7a384cafb51", - # "eu-central-2": "ami-05cfba925613cba71", "eu-north-1": "ami-013fff3fbe1b44cd7", - # "eu-south-1": "ami-076d9ee33498e5425", - # "eu-south-2": "ami-0a9bd5a675e804f5b", "eu-west-1": "ami-00aa3f69e07141166", "eu-west-2": "ami-073e61682f2137943", "eu-west-3": "ami-0fa84148519465f59", - # "me-central-1": "ami-0e6d2fa064807e5a1", - # "me-south-1": "ami-0166968d754514d17", "sa-east-1": "ami-03405dcb7a98e974b", "us-east-1": "ami-03d6e2aceefaa35b0", "us-east-2": "ami-0246e87085c5c98e3", @@ -322,27 +293,18 @@ AWS_debian_10_images = { "us-west-2": "ami-0164ab05efc075cbc" } AWS_debian_11_images = { - # "af-south-1": "ami-01d91bb5413549aee", - # "ap-east-1": "ami-04162e945020a0a90", "ap-northeast-1": "ami-043fed2cdcba4027e", "ap-northeast-2": "ami-0bb0231c184073ac1", "ap-northeast-3": "ami-09968ae34a843a6cb", "ap-south-1": "ami-079b117c1800d30f8", - # "ap-south-2": "ami-039abd0992b9b40bf", "ap-southeast-1": "ami-07ac0a74d21a3174c", "ap-southeast-2": "ami-0c7a13e86ce7afc80", - # "ap-southeast-3": "ami-02acfafb90c8fc9e3", "ca-central-1": "ami-09b3e61273dd34f3b", "eu-central-1": "ami-0c75b861029de4030", - # "eu-central-2": "ami-09ff43dae49ca4766", "eu-north-1": "ami-08869bacfa1188ec9", - # "eu-south-1": "ami-058bf36d271338447", - # "eu-south-2": "ami-0401e98c615a7854e", "eu-west-1": "ami-0591c8c8aa7d9b217", "eu-west-2": "ami-0e789c3dd24faa0be", "eu-west-3": "ami-040dc155c278da35a", - # "me-central-1": "ami-0b5a9e952bc027304", - # "me-south-1": "ami-058869731da985c55", "sa-east-1": "ami-0cb45622734c55ed6", "us-east-1": "ami-052465340e6b59fc0", "us-east-2": "ami-06a7641d5bd7bdc65", @@ -352,19 +314,15 @@ AWS_debian_11_images = { AWS_centos7_images = { "eu-north-1": "ami-0e5125a0f19c52a2b", "eu-west-2": "ami-0de2f45684e59282c", - # "af-south-1": "ami-0cf2f235226a4d1f2", "us-west-1": "ami-0bcd12d19d926f8e9", "eu-central-1": "ami-0afcbcee3dfbce929", "us-east-1": "ami-0aedf6b1cb669b4c7", - # "eu-south-1": "ami-0a3a6d4d737db3bc1", "ap-south-1": "ami-09f129ee53d3523c0", - # "me-south-1": "ami-09ce1cd69cab28540", "ap-northeast-1": "ami-06e6d2122baa563c4", "ap-northeast-2": "ami-061f5322ab2662c82", "eu-west-3": "ami-051806c39fa542e22", "us-west-2": "ami-04f798ca92cc13f74", "ap-southeast-1": "ami-03bfba2e75432064e", - # "ap-east-1": "ami-039ac400e94785a1d", "us-east-2": "ami-033adaf0b583374d4", "ap-southeast-2": "ami-0264ead5294ad1773", "ca-central-1": "ami-01ebef6e00efb2c20", @@ -377,35 +335,27 @@ AWS_centos8_images = { "us-east-1": "ami-0c07df890a618c98a", "eu-central-1": "ami-0b79da023fb461a12", "us-west-2": "ami-09195cb76ab892888", - # "eu-south-1": "ami-089ad68ee518459be", "eu-west-1": "ami-0819edf1cd94e83e8", "ap-southeast-1": "ami-07ab649c51b1c14e7", "eu-north-1": "ami-05eaebdafff627949", "us-east-2": "ami-05cefb3ebaddc75f6", "eu-west-3": "ami-05a3b9ccef6b9a4f4", - # "af-south-1": "ami-05603d0aec38099d3", "ap-south-1": "ami-04ebf66b7be0500f6", "eu-west-2": "ami-0495083a5dc6bc6a3", - # "me-south-1": "ami-040740782158cb0e3", - # "ap-east-1": "ami-03fa27f9c9dd340fc", "us-west-1": "ami-033e1fe6304139f4c", "ap-northeast-2": "ami-014911a31aba94953", "ap-northeast-1": "ami-0117f2fc9c6939327", "ca-central-1": "ami-00723d0970fc53863" } AWS_centos9_images = { - # "eu-south-1": "ami-0f5511636b455063e", "us-west-2": "ami-0e27c3746a0d5ecbf", "sa-east-1": "ami-0c70afd15bcb126a9", - # "af-south-1": "ami-0b0c19981dc5e5f1c", "eu-north-1": "ami-0a942e3eea51f9810", - # "ap-east-1": "ami-0a8e37e83bdd06c65", "ap-southeast-2": "ami-09825374904820651", "us-west-1": "ami-08e31531a8310da78", "eu-west-1": "ami-08be94d0e177189de", "eu-west-3": "ami-082f57b7c23b057df", "ap-northeast-1": "ami-074800b0d58e64b24", - # "me-south-1": "ami-070523667a38e853f", "ap-southeast-1": "ami-05a6e3d785f747c7d", "eu-west-2": "ami-056117c19265dad25", "ca-central-1": "ami-03f6ca47d93885ab9",