diff --git a/machines/fuuko/configuration.nix b/machines/fuuko/configuration.nix index 20da91f..c59ac05 100644 --- a/machines/fuuko/configuration.nix +++ b/machines/fuuko/configuration.nix @@ -7,7 +7,6 @@ ./services/binary-cache.nix ./services/dnsmasq.nix - ./services/gitea.nix ./services/grafana.nix ./services/hydra.nix ./services/matrix diff --git a/machines/fuuko/secrets.yaml b/machines/fuuko/secrets.yaml index b1a9ddb..b409e14 100644 --- a/machines/fuuko/secrets.yaml +++ b/machines/fuuko/secrets.yaml @@ -1,4 +1,3 @@ -gitea-mail: ENC[AES256_GCM,data:ck4S9YJ1BLUb6+mOrRmg22KWI1xQwsdIw1dowNk1OOk=,iv:+aQiTSGzmBOLYbIVgwH/SIhslKgdJKoL1ZaGAXCeqHY=,tag:H3vCEGMktqAV/9BASVR5tg==,type:str] go-neb-overrides: ENC[AES256_GCM,data:Ws/2yCNNLLEpa9MbN7mZk6BBBaJxtHN2X9I41baWJylZeUld6/h4WCxyHw4MWzigK7k26E+7CGVGThF5Ucd6AuvuD9dd21uaoOtwsAKJVsCavk6VPQvfAuSqYJcBYY2pSwDpA6KbXbQqhC9OgcktvYQdnvNPbsSffK4zhrDjcFpDYYyBRQWxqHu/ZGh2088ECbhm2OCWeC9/5u/2id8dHutip6tUXBIalFmWObc6zgx4atCJGdq9/bOPgajQzrpWlauV0h3ioMwp0gsulOJl2LuI7Lvbsvm+UWe8hVd9ZLqR+4ZAwC5oCQht68AxekKrLNl02KQ8rM4fmWJpbK4NsR/m8+ifMZhqIe8tqUUhWGvJqbxEI/Rsbqm92ToIHL5x9hNSZ/crm+hF4c2Uh9jnSA3E/tOxjZaMU5hB+2Y4tF83nz61tzFnwhQ32VxFeq6IHyMOhgQzGZkDPAyFg2e4tbG6zp5oMx2lsUlgbaXrSrzBU73CjWiLDiJFNyGLx7ADeZ4aZVsZnvGL6y7K4p0uVuK7KSNzoW0=,iv:tniWSP8RgSDJ8ap+PK83TcPAvRdaXWC/gchF6+8uffs=,tag:SC6RB8zyVmjjbLA73cFb4A==,type:str] hcloud_exporter-environment: ENC[AES256_GCM,data:TPMeNK7uC716PC8UqDCnUKtriueIkg3l1ql9e3lse46Ko3TVvwW1oAQRSbwK8CG5AjuF2s2Y8GJdYcI8PN6Z5kERYF1RL2GDpN4pLSuw/l0YqsFkt0uK,iv:cmB+hZHvbk1p8uRmLDyYdPr6rTsFxKcoTcQVo729sAQ=,tag:nkiSvy7rsoInDN0l+1FOOQ==,type:str] nix-binary-cache-htpasswd: ENC[AES256_GCM,data:IktPHrrvExeZlCPmP82W9AovC59ILPbMQExVDO7U2S9lJ9cQKP14mQPuYwA+yKTycIdA01MwRDbt/SxhVleZ+aKkyOPwx/iG5B0cQX6cVqQWVTNVmxlW2sjupnnwwibcdikU21CIw6YsDKs7pMqRAfC/U2OJ3POo2qH5GgFY,iv:ofzEQ143HQQGZIEVkdWCrcENz0i6JPljLDGmG0A7aJ8=,tag:a557cdgRD25jWHhZeT+CnQ==,type:str] @@ -15,8 +14,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-01-14T16:18:19Z" - mac: ENC[AES256_GCM,data:i6TJ+X85H+ptli5GaodNh6KbjqBLuJcs/Cy88JIQdq5az6nVJUtB55SuhkOAu35pPqlGX4tTBRO7OHupkEwS0Gpl2rC+OQB8gvnfuANzK8uFKGs4EK29BJsqNjsRdDmH1NjGjrIjau4spLz0wfELUcKtKofkZeLvzITsgzjRj+4=,iv:ZuFOIeXb+k1PWfWYPyIBKAnBaLZu+E4SeThysXCQ+iI=,tag:BFMwx9Am66pRSmWQWnVpgA==,type:str] + lastmodified: "2022-03-18T15:01:34Z" + mac: ENC[AES256_GCM,data:y7VqBCpINseuWdp4mnGUCawNZjqrNi8PbRsc49wMvsFALdW7LlsXF4Z/yVdjbn69/hfj6CXJUy2/lT5L8UUyJ3aX/gGd3lAcru4OuqN5goarF8IVINwch4IW/VEAVcknUTKdkQwNGJVEhOQhPBcy0gChaCGN0PhcaOYiYsK/+RY=,iv:c2bSraFo1n9tkVvNz97W1x9u+m/lwOBV2EMkXcl64Jg=,tag:kUf/2TzahSDo86touJ6iuA==,type:str] pgp: - created_at: "2021-04-06T11:27:21Z" enc: | diff --git a/machines/okarin/configuration.nix b/machines/okarin/configuration.nix index c40cd49..1b28c35 100644 --- a/machines/okarin/configuration.nix +++ b/machines/okarin/configuration.nix @@ -6,6 +6,7 @@ ../../modules ./services/ankisyncd.nix + ./services/gitea.nix ./services/hedgedoc.nix ./services/invidious ./services/libreddit.nix diff --git a/machines/okarin/secrets.yaml b/machines/okarin/secrets.yaml index 3fe94f4..5cdc74b 100644 --- a/machines/okarin/secrets.yaml +++ b/machines/okarin/secrets.yaml @@ -1,4 +1,5 @@ wg-home-private-key: ENC[AES256_GCM,data:UMNY28f8D4VN86s8RqhBbfCgBzLWOmAu1Id7RyIfp1Ta/BvgtfOz70Y3hvs=,iv:ph2O/wBwwThHnNQ5sHIc9ZOC6EXHM3fv4z3esTpJuj0=,tag:pROjuUte4+OZxPlhppceWA==,type:str] +gitea-mail: ENC[AES256_GCM,data:7pW7M9SVkdhGD1I/WQW2K/C/HQHBWGP+S0cXlo5rTaQ=,iv:fj3ercPsBhTZnGZFPVxd2wQ2wNmA3IYNz7xnf3P1Tjc=,tag:BJxcUoa+ZezGLKfHmXJJVg==,type:str] invidious-extra-settings: ENC[AES256_GCM,data:PVdEqmWBvz72Knq0K/oZMfC4f4ygib7QJ4tMua4CeeSFchQirD3bhHKEPxfzJ5KxIZwH3otLjB8wAFJ+fDCQsrf5owJwP+4gxPFjlpk3nFiB,iv:Q0Lmr9ZO5ijIZ4sDNo5YollD6DaHN56RyV8MJgNctHI=,tag:5W3euSI7OPJ0BYvrEZjH+g==,type:str] sops: kms: [] @@ -6,8 +7,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-03-03T11:21:51Z" - mac: ENC[AES256_GCM,data:Kmt4fa/ECXPzZf7JEazW8OtWRv6TbPuA+RHaNFvqR+UXdJ6Tr/6xLnJlgsuH9RoSyP1OLnv1K5JOeoKHkDvHJkB/bXBNLqXAixBZvZd1kuA3LHDR27n0gT8STACPvYCJTL3FsgVCDaIB9fpggInjk811Q075NGaE8o80mYJVpG8=,iv:6wNHT6M/u0cyyypl951Qja4pRteKIYFyoA8uK1NVCm8=,tag:kOCVWef7wY9TkhovGynFpQ==,type:str] + lastmodified: "2022-03-18T15:01:50Z" + mac: ENC[AES256_GCM,data:6yBbtg+JYpMuYpE4kq0pHxl6j3P03LyHTQBdYrw/rFaTHhL3IC0AN/IHfui+0uwrCeSQdl6KiFU48r0IL5RtB1XCWPC40OshFOdq64CzUpRpgMPh9K5SI0AxVfNvhGV3q2d99zRJGakxnYMpJuBk8TyYSH8S5+dU6jCnKfE4HA8=,iv:Vk7cYrRBphTdmBQoY1GaCcary6dq4/jV0fKBATFeNGg=,tag:U/xZTkm4ipfvBknUDtryJg==,type:str] pgp: - created_at: "2022-03-03T09:13:41Z" enc: | diff --git a/machines/fuuko/services/gitea.nix b/machines/okarin/services/gitea.nix similarity index 97% rename from machines/fuuko/services/gitea.nix rename to machines/okarin/services/gitea.nix index be8bb6b..6a507c1 100644 --- a/machines/fuuko/services/gitea.nix +++ b/machines/okarin/services/gitea.nix @@ -18,7 +18,6 @@ in log.level = "Warn"; lfs = { enable = true; - contentDir = "/data/gitea/lfs/"; }; enableUnixSocket = true; ssh = {