Merge pull request #66 from entropia/remove-transcaffeine

users: remove transcaffeine
entropia · Aug 23, 2024 · bab3955 · bab3955
2 parents efdc1dd + 8fd0c9e
commit bab3955
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 722 deletions.
diff --git a/.sops.yaml b/.sops.yaml
@@ -2,7 +2,6 @@ keys:
   - &admin_xanderio_age age1e9yparaev0gxwmherrjpxmfzgqga5eqdw53lrnv05s3ppjgzyceqftnwpx
   - &admin_evlli_pgp 56B96D1C10D68F49E31BB8A18092413A3F6DD75F
   - &admin_jcgruenhage_pgp 09E8418B46B53B0F825DE4BE018ACF465280F466
-  - &admin_transcaffeine_pgp 5E0A9CB3980657CB9AB94AE6790EAEC8F99AB41F
   - &admin_leona_pgp EB5CEED62922C6050F9FC85BD5B08ADFC75E3605
   - &host_oob_gayway_age age14ud0wf5nt2y4vh2kddasnqtdyrhl5xcrmh8py60tw9z5cw8xy9wqqyxsp6
   - &host_abrechnung_age age1tcvenngz4qfgyqpxcrf9xgdygs730h83d4ln6xz99slhnaeek5fsh9xgrx
@@ -17,7 +16,6 @@ creation_rules:
         pgp:
           - *admin_evlli_pgp
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
 
   - path_regex: secrets/profiles/entropia-cluster-vm.yaml
     key_groups:
@@ -28,7 +26,6 @@ creation_rules:
         pgp:
           - *admin_evlli_pgp
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
           - *admin_leona_pgp
 
 
@@ -40,7 +37,6 @@ creation_rules:
         pgp:
           - *admin_evlli_pgp
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
           - *admin_leona_pgp
 
   - path_regex: secrets/hosts/recipes.yaml
@@ -50,7 +46,6 @@ creation_rules:
           - *host_recipes_age
         pgp:
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
 
   - path_regex: secrets/hosts/oob_gayway.yaml
     key_groups:
@@ -60,7 +55,6 @@ creation_rules:
         pgp:
           - *admin_evlli_pgp
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
 
   - path_regex: secrets/services/wg-access-server.yaml
     key_groups:
@@ -70,7 +64,6 @@ creation_rules:
         pgp:
           - *admin_evlli_pgp
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
 
   - path_regex: secrets/services/tandoor.yaml
     key_groups:
@@ -79,4 +72,3 @@ creation_rules:
           - *host_recipes_age
         pgp:
           - *admin_jcgruenhage_pgp
-          - *admin_transcaffeine_pgp
diff --git a/secrets/hosts/abrechnung.yaml b/secrets/hosts/abrechnung.yaml
@@ -11,77 +11,57 @@ sops:
         - recipient: age1e9yparaev0gxwmherrjpxmfzgqga5eqdw53lrnv05s3ppjgzyceqftnwpx
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvdFhyc3BsRlhTOFdmQ1BT
-            YXhCNmhCa2dGY1JaNUZjTFduSE9CblRGMTJRCnloNm5jMnduNWVDU1haZnFLRnAz
-            cEl6NFR4bk5zMkw4YkMzdWN6dHk1SU0KLS0tIE91MW5LNks1TVJLdHE0QXVnajM2
-            SEgwbkhsSjdaQVhGVWwwdjdqa3NiS0kKbchCn/8pW6A2BNARVRNCbUTZLsxmFXWR
-            UgGTuxhyMr5/RGLamx4mdY5AIWi+4GGJIdW/k6i8Q7B5x54DMdkK3Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPMWJzMzRYRjhKS295NXM2
+            MlB4Zm90bVd0Q1VYZ3hMOGY3azVMYlZhK2drCmNMRGhMTmpHTHBFZVJ0MWhwYmdk
+            L0dVNkpBdEN6dWpRUmtQRldzNTlnWjAKLS0tIDVWVTBCL3JaTjl2ZDJzQ0R4eEdF
+            b0UrTC9hZDdZMGNKOU45ejNLVk1wMEkK+P7dI0liVpQdcKKRPzJrls9hTCkQ+dKx
+            G83ylsKyt0PGgqNo53PCrwZKlV8Lid9PkSTWilXFNauWsqcBZUEakA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1tcvenngz4qfgyqpxcrf9xgdygs730h83d4ln6xz99slhnaeek5fsh9xgrx
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5eW5KV2ZZYkl6cXFxNm04
-            b05TM09OcTlTa2FJOFRWd29CbEpMSmF4WkZnClhFVDBUWmxKQUo1Z3AxeGVoOGwz
-            QzJyNGt3UDFTZUl6N0ZPWG1IVkREdEUKLS0tIDFZdFJQejEvYk8zSWxTVlZ4Wmdz
-            RkMySzVYU0d3NmJwNEVPT1NNcmxpS1kK+ahIQugzPcovyndhA8f873yGCXi9VH5L
-            ybkC/4ZL082ANAqd+fCqqCa8TDLar5nSSTnWNsC/tMs7cFNSyNjLVA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTZ2g5eXpjMW9TT0xYN0p4
+            TXh0ZnBnM1gzejgxeUJPZy9MRHA4VzZlV1RzCi9kRVEvUm5wL1lZbE8zenA3U0g0
+            YmhKQmN2YmJqY3JtZEM2VERrR2dCcDQKLS0tIGdyYi9CTEV3ZmlmRE1wT1pXczhh
+            NDhhaUJvU1BZUGg1SStxaVEwZXpSNGMKE6y1q1tMeL8ABfmO01BQhRAulN2/Ez7+
+            K9bpKEMcXGgMNDrwVP8qt0Bjr2o7T4oIbCk1L8mXU/2RpHzKl/aFQw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-05-06T20:08:20Z"
     mac: ENC[AES256_GCM,data:nNUo/+lJ9nApiaTpYDfkowCH+l/TqnRQY/U8W8uftPC40fZ/oqwS8/HDLyVVS4XBZQJfN0EggCQ8S4Ouqkvc8XMjvWq/BJRQ65hCZ+Hq3xQ5ZHM6egtd3PByQwOR24JpVxts7fnxbCkZGLCoxc6qEFCi7lRWU598VrqaiE9tFPg=,iv:ORNJiQwNhGQaF7noLpaC3iS/q6rVVEGlVNEiaUYBv3o=,tag:ZfLZU0lkqJVspFi/EX6MSw==,type:str]
     pgp:
-        - created_at: "2024-04-21T13:39:09Z"
+        - created_at: "2024-08-23T20:50:18Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hJ4Dgju0qH8x+MoSAwMEsdhvSUciG6hrrCLFukzld93HuoqvodDM/vRLaBu02m26
-            pZMAqNO2Kknmo75GB1Tu8ufu1KDGq/fIDFPTIXVzCwwOmaj5nL2OZ/9Gv7mYSwO3
-            zknf3JjOOFbM+2BGesnZMEA7dxQ6qT6O3J0PKjLYSOZ7sEB4p3PPJndSat3wXm7h
-            l+swvluTP8nyiZWoaDwcINRmAQkCEJ2rAaI16Gx6EOOruwgQkMs4KrTy1hK9yeSL
-            dwlY/wLs2obBj5J/LZLgMU9l4qITWNIVakvdSY2jXO/DCVxum1QEBz42lWkkpa7t
-            tayU15xvSXHY3hBflcdrLceR3dXppaid
-            =BHwg
+            hJ4Dgju0qH8x+MoSAwMEWFZzJlJ1YlMFlA077NFkrt/f50j0HKo1AWpKHWtJTg8B
+            WIKTVpXdeh/KHmQtLy1mt5BLLlAspnDtdnuwJm1hdJkpovuMG572zti1Dnpp9Yck
+            A2Q+qVzQ3wo21XE60TOAMGmwFRqQld3TlvYfZUW9xvH5PLNqOFTiPduXwIf5bBpG
+            SPCFhyze1ReGRXe4IFwWeNRmAQkCEMQydm3e9vtVliRWaGcm1n0IlQQ0S2m5F6MP
+            UaafjhBwCcD5AQKWbev/KUiW8Ugv/bF8sqJMzP8NFvGlqBqucwDBRB1EphqyKV5q
+            YJQUU6P4ieMIFGwoZCQXFLs0P9Ckquzd
+            =llzJ
             -----END PGP MESSAGE-----
           fp: 56B96D1C10D68F49E31BB8A18092413A3F6DD75F
-        - created_at: "2024-04-21T13:39:09Z"
+        - created_at: "2024-08-23T20:50:18Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DQJGoFMUUQaUSAQdALD/PfmVRw+xJe3SRWsQZ1QJQApSvNSOO+p1CM1B/aXUw
-            LNtQNFIKZ94TlP2ahkCW45yuaCjb6GqxAr0AvcjJYngINe6oRxQXPNMTog/q9REv
-            0lwBTKgL95qff+TefgioWqv1/5IdNe3us3cEbE5755GU3j4Qe/qm9cYAyYBTMoYo
-            rqMJVRGz4Tofr8NzS9eEbVgd2Ocrf8zhloao/4NQkfHnTMUl26pzvOoS4FFjnw==
-            =uH7t
+            hF4DQJGoFMUUQaUSAQdAYu5lso+s6QAmfGlsDLmCebemzWGWeJZW7ibxKwdE5Gow
+            0nyyfMHShe0LDgudVPW+Kcy8u/+0n5NikX/zgCql06QtEBfhbPG4rsIjbC9H/qwH
+            0lwB/SCBShdXxw+PUB/2CJHns5DNFs5djih3NoX9vUKbvDf/KvDAyPxfSkIhEetJ
+            FeZly6sbybqa6X+OlrHx4s0Nons0x4tsSQc/YIJq2Qnidu7JN0/yKgm4Y/zmgw==
+            =UQTD
             -----END PGP MESSAGE-----
           fp: 09E8418B46B53B0F825DE4BE018ACF465280F466
-        - created_at: "2024-04-21T13:39:09Z"
+        - created_at: "2024-08-23T20:50:18Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMAxEs7W/4x4lxAQ//brvk9JWOBLFrelXRo/iLcqsPLm0SlhcPbO6FVAlkOHbF
-            KHOpA5t0uFBr3CK9qOxOrxLgGJQ2AbcVrAmPj4qOD/EYZtcHfOAsTas1nmbtCJVw
-            gnT1QauJncVWQ1doEjzpBWkJf0HNG+IWTNntX3SnAYv/mN/+kHr5056CT/WuCNbl
-            8Sg6tk0awCLzsbYcmdRFPiFTdmvKQYc7jiPU6qDEATTjfgZgO142D6tMQtt6k6os
-            2o44yInNOK0aOhXa9JMG6hf2JM1qiQce4QjpFsaZ9oAS/bbn+PUJ8kdZLArtBqBs
-            0bjNLzNFJ2erMFL7s7B/92mC6Eke/dpajeBfvcG9dgDQkKqK+uH45RuSiXoWnz0r
-            YVEpaYd2m0kqBOWKNJ0OC1DVn39WmtfNJAH8WH8e/tueB7uoo0b4hpmksydWibU1
-            /vjeLoebg6LT3Pvh0UEq5UpxiBRMvBrxKtumjaC0xXXYPKx/lLXNVgGhssHggnSI
-            6Z7IBauIeotQbH2FrGYh6RM+Z12FXO5yrNcMvTWLP4ZPY9csUBekjlcDk/Vgt5/f
-            1YSHVkeRZLUk0/z1EbZ6BPRTmhi3Rwr1a/dW3So8wCAXdosfL5C11V/YSpG/BMxx
-            Q2/mXQ38QNLhr6c5WK0RR8W4HE/pt5TAjZeeQNT1Rt0Xj6DB2pyOHCJMFFdsrr7S
-            XAFrszXfRNnSPvJcQ8eeo7TmdPeFEHsUwbHf78jAsIaOs5WyO6BOSpHjXOpP7UHr
-            YJPuA4UpfzMolrMz2lbgCUDEkH0OyZD6YrdzBe7hG7Q7b8kOV1ThY6hxSbDv
-            =p5JT
-            -----END PGP MESSAGE-----
-          fp: 5E0A9CB3980657CB9AB94AE6790EAEC8F99AB41F
-        - created_at: "2024-04-21T13:39:09Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4D/2siLyjns28SAQdApZzPFNKFe14Fyb1Za5zc2VcekbPYhawHDx9Cf8xqnVUw
-            btsE5X7z4Q4z4oeALbLB+hsAmhzkLKsw8c4Un/xJrUJfMGv7BMnzThmCQnxrbMal
-            0lwB3NIhNHZsfL96IwQyaFYtjfPI/RaUQdLoHM10sMXD3SqPV+i2Y5Vd9fIUtKYl
-            1ADmjsV9jofvPZ9FlHQd7366QrTrQyO53y5cEe9ZGYD9nCqHzFQDGCLxSkLteg==
-            =oXvq
+            hF4D/2siLyjns28SAQdAKPYeGqs8zLB7WeryoVP2x1k3s/EVBMJmMOTT/yIy+isw
+            MKi7jKrkT2B15SQF8GmKIsuOm4bkeY3EeGurxCP9H1Bw7kWxTmiyMLvneu+kkgsu
+            0lwBN5z75SrRy8TZPVhADuykTp2MomWfihkYXeg6ZIRPy3qS5B+GihtQvbQP/SbJ
+            r1x6khcey20jIDvO4oJjetHK2Yy1++hnu+bQJxB+09+IpTxvGWFTuFhG5MOn8A==
+            =njNZ
             -----END PGP MESSAGE-----
           fp: EB5CEED62922C6050F9FC85BD5B08ADFC75E3605
     unencrypted_suffix: _unencrypted

diff --git a/secrets/hosts/recipes.yaml b/secrets/hosts/recipes.yaml
@@ -10,54 +10,34 @@ sops:
         - recipient: age1e9yparaev0gxwmherrjpxmfzgqga5eqdw53lrnv05s3ppjgzyceqftnwpx
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZbWNNV3ZYU0llMmV6Y1l5
-            azhRcDc2NmxkS2xTbTE2ZUE4WjdOMmR2OEVnCnRWSEp5RFRtZW1ZRDZHdTBJTnBT
-            UXA4eitFLzUrMWlmdmF6WitxRzMwSjQKLS0tIDQ0cHhZdVB1V1VWU3llM2N1cFNS
-            WU02TzhLeHhNeHkxS2dDdlJEc0lJNjQK+Sq8LL0bL6CMjHwhhzCTAP/YVJWjUE7Q
-            uqVAR0ILx8iSQQFsVp3gHCS2rsZ5k89R4Ser/WmuVTDShRbu+TxZrg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6VWhqYS9QaVBDaVh4cmFo
+            NVFBYlIvS3NYWXhWaVllQlBaRzFKYXdNRmxZCm53WGFObW4xN3Nkb2J4K0hRTUFX
+            bCtoNi9TcDlVd09vcjU2SVFFYVU5RkEKLS0tIHgwVWVsbndMM0tIaDFxL2dIVi82
+            anVzUXFEa1l1MVRveTE1VmpaQVV6ZlUKA+pVYwE5BwDS6ahj/Sgp07a/XJHxLOtC
+            cGHBUCmW7JbDgsmn9oF6+fM4ZrU2hKOBWMUWe0G5R6iP6fhrXfMBgA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1zngzchzzy46gyn99awcw2fgn97wuv35afyqrat9442sakgv0ugls606zlr
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpT1duWk9kcWpuaUYzdFJE
-            R2xtak9HTHk3dmlDN0twN2oyZGkrWnh2Wnk4CnF3dGtwT3lCMTVqUFFkd29HWG8v
-            cVR2NGNRVmlaZTJuSm1nNmtQdXN5NFUKLS0tIG5kS1J2NnRGN1I5M2JCR3dIWUN0
-            WlhBMGl4bE1XaGE1RSs0THhzTkQrekEKqkZIm6L61KrnCqpzXrfEKD5COx/wyNht
-            jCFcPxRgDu2Fbat2hbOhJXLTwJx2/SQyNtcCT6map7CcVIckUA2QAA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2dFp6RUdmTmJEUDBKME9h
+            VzlCUTlHNHphbkRwSnBmOGxMQVROTk00bnp3ClFCc0NOdEVUY05Ec1JKckdwK1Bw
+            dDVVZXJPYzg4cUNCTnl3YnkxclNaNE0KLS0tIEczSTVPNzBsRGg2cXY3cEU3clRZ
+            RmtTaDRVZ1JyV2JKdWUrMCsvb2pnZHMKnUITQomP++mix09sokObnzdpcQVVtyIL
+            xdOEWEmSAhTttXqkCbD6kYECt4VPOXGw8RLzaIuk6o+QeLY8FBoEJw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-05-26T13:19:02Z"
     mac: ENC[AES256_GCM,data:YPC+tQes0wYvb0XX4l8p+30gsuZ/Iq1ieDp1qXIV/G7R90BVlM/DD6tPkLN8OMkQXLpQ/1c5QuujKVzy061GXbeqC7DsVG/+QBGvck0wsAtxI+GOfrUDRsuPvOJk/IvQlYjyWDl41clwMOfmDklwYps3IuPRrraxiCA6IxoVGyo=,iv:zWesK+8WL+HHPQloYOl2kKs5tFOBOav0M+vWiY/3u9A=,tag:gu/bCKFVlZoRTyNJqcYaQQ==,type:str]
     pgp:
-        - created_at: "2024-05-21T16:34:00Z"
+        - created_at: "2024-08-23T20:50:24Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DQJGoFMUUQaUSAQdAz9DQymYUCbLLygdJ7sLWSiN7f4+TRVhtOyuFlr4xVHUw
-            KBRbMFwN3tJFwgMFZeHkUZhCfOpZZvX/lHA7B+AAfdTrrWASPqZnP1rYmwFR7/QG
-            0lwBAquHMH/k7MIkYY00Zx/gWJAhcbsanfaPMwjxI4gJO0WfSMrHYJ8Dx84+5JQv
-            PiqFPo2fyfIOuR6Ss+cpADGwa3O6ohJbKdGVlT8LdJQS8Org2rySlkKS2/fc7A==
-            =YuPP
+            hF4DQJGoFMUUQaUSAQdAJuXLedOWQ2thyllW+d76S2MAPkO+WxE8aBOU39F+zjkw
+            +Gaq8eMTgqT+iw0UrVoNquh+tgTUf9EigKnxAcglWdT+icVaxH50MRxP1wbke8tZ
+            0lwBWidqz6LzuOcHb8GEH50dHMphmj2UJ/46vWG7JCUC1vm19gbMeDfWCXCHVVwt
+            MkLGV1FswsrgpS3+tB5df1AQzJOnodDBf190hG0PmqD+3R6/PPeFds0DTB65iA==
+            =lHm1
             -----END PGP MESSAGE-----
           fp: 09E8418B46B53B0F825DE4BE018ACF465280F466
-        - created_at: "2024-05-21T16:34:00Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAxEs7W/4x4lxAQ//UzgtN1ZXjoyOc3MhvJBaQ93ujJ45i9xb9UE/KyJUTEwt
-            n/O9PuICg0M81+KiPkeB0SFMxwCPZA+uMIkKpnHZa2BuZQkNoD2DsufMyaZCpMVU
-            bYC43V741PU68kfjrJMY3y89LFKCeTVxeP7nnK7HF6qGxx//J7aaoBcF/2+mQSKR
-            /LeZeZMXbqgLQZt5Wm3pDrm5WqQc03QXYEvitR/6fT+bXT6hn7lGGt113RBwTPL2
-            wnyipbS8+PazU+tz4e7CTSFEBASZgIIGIzMwSkIOr6Vbp3aPyHfDgWVNUeC+GjTz
-            kUeY8siiefquqIjgc63flkVUDpFLFE5cxnnBD8TGRYjBj7Z659TYJp3wZKbNebVJ
-            aLqYI57LarUr2WO8UhGTFHQF2HmPb09NbEgaoLrvT59QXyi3JumXHvLSkQe+fTmc
-            kDmFm2R5sD/7n7eVxg9xw0cesx52j35384w+/oyFneI6sfAuzrFeNqyxp9EeIOvw
-            GI9MWM3Ya2TWNjuYmy7zjJ7KPBKKyhlMSVZkq0HOq5VoJwylvYJFH6cUtFC4Mfs/
-            LWbYxORuKAJVClwWEo9N7CQc2ZzA688WVx7cGJbCUXHg0KwobIG8ylsF4ox2Mspw
-            Y9dbCi193/YLClZ9LSiydxTTBPfLjlKfWxV25IIDUIf4c8k1kJ7Yh6g+fPOB3FbS
-            XAHMVAD5sJGYOrqpQhut2DeZP2AEhEDmjuZjuhg4EBJCz+5AvlnZQ4k5lKgl2Qic
-            6zZtFrcWvTHPpRLKlAOxZEI/CEiuSiXu2RplO8air/cvUkQhYdCkIGJ66Ac6
-            =CVI6
-            -----END PGP MESSAGE-----
-          fp: 5E0A9CB3980657CB9AB94AE6790EAEC8F99AB41F
     unencrypted_suffix: _unencrypted
     version: 3.8.1