nixos/kelder: Move nginx to separate container

2023-05-27 23:45:53 +01:00
parent 44c5a9ded9
commit a6db08acda
39 changed files with 607 additions and 491 deletions
--- a/secrets/toot/otp-secret.txt.age
+++ b/secrets/toot/otp-secret.txt.age
@@ -1,13 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBhNnhH
-Q0Q1N091YTRGMkJTSEt4cG1zOWdBY3pLNExXRGQzaUY4S3FZT0NZCjhLRkxVdmtC
-WTNvMW5Lc2lkaXpjYk1XRDhZRkliRkl1RUJhRFFQRHN5VUkKLT4gWDI1NTE5IFRG
-ZlRhSy91R2hvR2VVMTA1ZmkrbUx6aUlsQncvdzFXTDBudktmOExLM28KdGVESDNh
-bFN0ZHNpQmRJVGRVaU9aT3EzVUFqQVpZeXBQUWhpQ05hd21lVQotPiBUUnNOS0Et
-Z3JlYXNlIDcubzAKNmJ5OUlLd0M2czB6eHpKQmpOR2I0eGVsRmgxeDBWSXJ3ZE9j
-T3cKLS0tIEQ4ZXhnbXNuYm1hWHcxcEJVbUU4dG1SeHlkem11eDFlUUkrMExkZXhm
-RDAKyx6HkEXjydv2DK0rA3kK7LO3KSjoQ5jiv2iGUFz47/4eJe7mpOUgpWbi4HmL
-VBC2dnkFG3eykyrcVqnKV6736n/p6g9jhOpPamOCQF4dblqF+I58GpbhhEDKPcsz
-Vy+y7t8ejj7tT/3lu78Uq50ru3JwfDdtIDTvRCGn4/8kYcsTLsivH8We/+gQ3rmO
-ANe00nmRkE8nioHoaORGpg1kfWw=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBJakpk
+a0FxRmUvZWpKWnhTYW5BZ1N1djczcllWR2RncmpJendITHdCWTMwCms1Y3VaZG9i
+WnIzNkZtNkJtTmhYNFZHMWtjR3krMHpsR1lLK01SNWMySU0KLT4gWDI1NTE5IEdW
+TWgwdnBDUkkxTUFFZ0JUNURnZXRhakdxT2xUU3VDdS9nL0FsMGdkVGMKWXFyR21F
+NjZGdWw3ME1JaTNBYS81VDN6TWtBd3JuSXBHZGdnQmE0MGtnawotPiBgLV5oT30h
+Uy1ncmVhc2UgZHN+ICx0NilvNFogfTRJClFzTXpNQ0pzdWoxRlJDVnpObnVkNHVU
+RGc4ZWwrdVJjbzVQcXNKSEhkMm8zR2IxMFhVR2hxdlN2S2QwaGJTMjgKb3BENnVj
+TVF0dThvR0hWYlZBTk5RNHBvZ1psdHJ5ZEY4TjFGUThvSmpmaFhVZDFxeUFCUXJQ
+M3NpVm8KLS0tIEl5b1BCYnpjSEwrR0sxTWlYdkNvQUVrS2MyWmYzTUFuOExWRi9J
+dVByaXcKzz/BYAtZMazsg+ajpTTDwYiE7GAQCR4jTIIOqxTSM35xBTlgBz9MD+pe
+sI6pmpbp8Wdn6qMX+gz8qloan5VCol44kS5YPL3zw8ChScvW6DMTpcsvZV2zR5E8
+zhm3IsYven3x4zKJD9GCJBc5niSX4oEDHlnNRs7k65CIr9lGCit1r7xgTPHRfRVG
+NbrnpwOZe0MNXCONmRDm7p47UgnhzIA=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/postgres-password.txt.age
+++ b/secrets/toot/postgres-password.txt.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBLb1g0
-VnUwejVpNnhJRXE5NUpyRGpFK0NGVkFCbm10WmViUzVoWDNTRFNZCnhDTVBpQkhV
-TUtDMWVMK2hraXFUb3ZMc3BOYjh5NzJmK2VPSHlRR0hGbEkKLT4gWDI1NTE5IENp
-d3JBbXlpWE0vUytpOWhHS2xGNDcyRWFDRnE5bk45MEY2U1FTQVlZbTAKcWh5cXRl
-aUxPN2ZvMWJlSE5UL0dYL2JQQklCWThaM1JOYmNDQm1IK1l3cwotPiA1UGh4LWdy
-ZWFzZSAmbytmIHYzMQptV2lNeXIvRUR5aklQekFsaVFhYU1GaXp4VDU4eWJpOVpL
-ZkN1TzIxV2hNbldUdmI0Zi9JMmVrTllpenYwYXA1CnBSbDh1QUxSNEsvWE1kWWpN
-S3IrTWVCQmtPVjNmanFGZ0pNbm5Od2NOZGF4OVF3RjBQcnQ2RVMydFVtSQotLS0g
-VWUvdjQ1MHEvVHRGbFgwUHBtMTRjY2lLZTZqaWF5bDJNajBNMEk1Y29wSQpkkJIf
-wMlKwJD+UO+kD/cfF+qmeNPsgXaODyxHVjU9Oo8ZLcUhT1ojHTDmk+o2KC9S
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBZanQw
+dUowNkxLVngyeVlDOXc0bEhZMmR3OWU4T29HbHpjeUozVCt5R21RCndhZ3d2Qm4w
+NldVOXh0L1RHZ0gzeXl5TjA4bzlXTGJ5UkgzSlBpeWdSZ1kKLT4gWDI1NTE5IFpi
+dUpwenhSWFlGMS9ZaktQa1VaQ0pYK3pxVnJHZDd6UGFNL1FCVlF4SGcKZW9aUXJ2
+YnR0a084bmQ0WGdGM3IvK0dudjdabXJCM2haTUlkNDh0WFpBOAotPiBAJV0zcWwt
+Z3JlYXNlIFA0ZityVQo1cGR2NFJpQUYwWUt5NS84a0Q0UEpIaFRDZkhzUkUyeFlY
+N1NEOXMvUkxDTmhYa3hsVUt2enZ0MmI0VkdaOEhjCmhiaGFOZXNsNDR3dURzRnpZ
+dU1qc2tkaHN3Z2tNUWJQNHBQVnhqdm1NZ2dJWk9XWm1HNERlNUkKLS0tIEdHRlRu
+SFl3VUFOWWk5RU9PdWw0NURJT0wwMHRhWWpZZmZkdVZrNmVQMWMKKHVLFtPLOM5/
+jOml1gO9qc+457t/8Gzecz+y/LlI2HXoanyWC6VH9I2FhX681p0tuQ==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/s3-secret-key.txt.age
+++ b/secrets/toot/s3-secret-key.txt.age
@@ -1,10 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBCY1pN
-dUg0bFhWcmlWS0VhZWIyaTFtU0tSMDBOMXNXenE0SHlRcEJ3bDBRCkVDZ1BuZmhL
-VUF3LzRSUWc2cThEcE12anNrOXZQeUhJU0lLZWJxYzgwV2sKLT4gWDI1NTE5IGx6
-OHNpbkdyZVZnNnh4dzBmSE1Pd015Qk9GNUM3NExXSmJ5NGRsSzZEVFkKT1B0U3Mv
-bFJjMXBaVFIwem5GWFdnQXcxWXdtTmg0TmxZQ2V4SlNHZW9EcwotPiBpLWdyZWFz
-ZQpLckJmUkhFYjJFTVh1YkVsU1M4Ci0tLSBsZk00eVlDQlRndnRSVThnbFVrSE05
-Z09POG0yNmRzSW1qRDIwdkFYS0Y4CqeXVamc8N6KPRRvXsf8crK2QbIOXsBhA9oA
-VTpMqHLku0tfEXAnBb6HsQ1zKy+Ng/w=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBLWDFU
+RTNYT2JyWEw0TGNoYjNKWVdnUllhdWcvU1J0SVllK3FuMEg2c3l3CjgzSW9OVHRL
+dFFwYUtzVjB2SVNNQ2c2WlVoMmgxRkNRMXN6QmJLekFJOVUKLT4gWDI1NTE5IHAr
+K0dXNU1paGx2dE9wcXVLZktKU3EvbVhPUlF2T0dlaGJibTdhK3JQZ2MKaU8vcnlU
+aXNobEUyYjhob2JEWGJOaUNNY1R5S21QNnArc1pVZjlUS0ZlNAotPiA1ZmEqRT5L
+LWdyZWFzZSB2OyBnClBabmpUM05KL3dHRGxIU05ZcDh2NDhxWjFsOFNOR3lDRTBv
+dk9TdVRBb0N4NDZobk5tWFROSVZmRUMxTmlzNEIKZWE0R0RZNFNvZG5iNzVxNXJx
+dWhlbk8yMEFUU2pySVkKLS0tIE1xZWkvdnpIWnJrWVY5cnhwQXJTRFgvMHpjRUNi
+RkxxYzlEWS9qTXJHY0kKMd5T6+KhbcGgHRPRnXAOi3yVkeweYqoZi64T1uEZuIi/
+m0K3sLF0FuEivPlk56nQUg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/secret-key.txt.age
+++ b/secrets/toot/secret-key.txt.age
@@ -1,13 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBNL3dt
-YlFYcys4clVBNHcxNDl2V3prWFE1RFQ3U3R5NCttWGhGbThxdnhNCjZHMWszQ1Zs
-NXZwZHB0M3V2bEE0SDUyREU2emplRXR6dnJFNzZOU0dkV3MKLT4gWDI1NTE5IGZt
-L0VhanNlZ2NHb2lYS1lJYWpvT2VxK0h1VWd2cXd0cXYzY1NPakpRbk0KR0ZVK2N5
-c1Z3Q3Q5WVA1b25pRytvaHV0Sk9sak5tRkYwSHU5ajduZnFpNAotPiAjczJMLWdy
-ZWFzZSBLJFdzPXspIFIgJUltUFU/WCA6CnFqMDRHaStYWEVPQjFFcWdnU1pQVUxl
-ODJhaUhHSEMyc1hFCi0tLSBvT0d4SGhPVjVNWGNMOERXZkEwTnRKTXZaZWlFa2VS
-dnlpUkpUdUhlN1EwCvfg36Oq4+T1ktBWRmPnarOpYk+MoASauHpoBuS9PQNfrIUk
-uRUVCzsPPzj9eDapBoYo+4FbvVH3jq43luiCPDLH+pr1c5Js9OrCRTLWT8TWtzqj
-gFjVNBQ0l8+rl4EDSzzDpoCLZA3V8dgLcD7OA8ThqNABEr59obYf9UXTEJnePDFi
-l9HqZa5fvwG4+YUM2X/8xHnvAfe6roi8t3LIfh5x
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBjUElG
+ckQxdnM3azVzajRMSXpMNkF0V2NvUmI3N0IyZGozcVJsRTJoWms0CldodU5Cdlh0
+Q3NBajlWd1c0T0JoazZsM0VhbjY2RWthZE1ZVXozRjF2Y3MKLT4gWDI1NTE5IDJR
+cnQrUXJDUWNEa2Z0WVJIeTJuUXE3MUN1WDh6dmo1OWdGNzRMYktaRzQKUUpoZDVY
+VFYrVjc2RDZXd0JUVDZKaVlDOVpVbmZubndydC9vTjVPRkpmVQotPiBANkA6eUJH
+LWdyZWFzZSBNRmYyIFoyW24iRXwsCnBnCi0tLSBvUlB2ZkI5dTNWckJCL0xTeERv
+OGNhWXdId2tmdmdBdTBPakJydU1sYUFRCukS54lTRVAMDI4MB1swc4ncArY6p4qf
+jY1P5Pl+tZ0K3eSK41vDeMy46G0PVxKGVqANtNaXqjfRualUQqcUqjEEAztX9ivP
+Q/gqOgvQL9iUMBEyUpxQPKJ8O9WKik2vhiWvY36qdHA7Av5hJmIMJ54XHwpfFbF+
+5g+uQdohH8WLJtot5wxq8i8wm2Fivh0xN40xnJiybx54yRmNBa05ZpYa
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/smtp-password.txt.age
+++ b/secrets/toot/smtp-password.txt.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBsUTcr
-TzBqcnJGUm1xSFlORUhjQmZDdjluclBxT0FUSTBOeHN5UVFwYTFFCmFEVzZ5YzJ6
-dUdXVTFrQUlpWG1WTlFTd3ptRThjSWorM3liT0hwaDNSTkEKLT4gWDI1NTE5ICtG
-T3NEYlR3UDlQNnJxaWdlaFFPcE1Wa1BGYlZCTDFQRi9SdUdaZTlRVTQKMWZ2bjJO
-bkxHTEpjRVJsWDYwT0ZVUXU0Ny8rbDRBWDZUakpNeXdEejZEMAotPiAxfnYzUC1n
-cmVhc2UgbHs+LWRIJiBqQ3p7ICw/cgpKQWlaRWMzaE1SeHBndGQyUzVXQkF5NFZZ
-dkF4eTRLLzBEZDFTMjdZSnM1OUU1NkcvaVhnQXVpT1lneGFXNEZpCnIwVlA3YTYr
-VERSemcxN0tNUDkzSWplazdaRlRQWi9XeWtaVXVteVVMME5VdEEKLS0tIHppU1lr
-SXluREF1ZXorTko5QWxBUlBac1VYWkwwd1o2eDJlaUJLS2hkdjgKtWP+3BE1JxT3
-ux7ZU05NekTOjSVj4G979hTaDL0X+MtLdCEWftMJV3NTs5R0wxs7Aw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBOcWZQ
+ZXgraXdMVTZkc3U0WGk1ZEdxVjBIVGx2THl2eU9kNGF3WHV3cGwwCmI0UFJpRlRa
+RGhUaDRLbXpJZjdGU0NjdDNDT3RjSThGMWk2N3FWdXE3WVEKLT4gWDI1NTE5IFY4
+RFZBT0ZnelVoNE54R1NSTm9xdk1SRHVVRUMza2F2d2crbUJPWndxa1kKODlxdjlP
+RE5FMFU3N24xWHNZMk1wVWVEalN3TlVVWTc4cDRXZ0oyR0FuNAotPiBDXTBbRmdc
+LWdyZWFzZSB1JmRDRThLIFIoe30uIlM/IDAlcSBwXWBoJQptbkNKc2NtWWFXSUh2
+QTBzSC9rMDZqT1NKMW91MDdQcnE5dGk2TWg1UmNEZVhBRWx3R2FyUy9lMFFPc0U3
+WTVBClJHSjNmQVBhc2QxRXdJWVBWNG9wdDVLOGdjQTNyUThZR0ZkUStYbG0xdwot
+LS0gWllWMU9HdnhXVElNNENOSkZUVzhtZzJ4VlBKZ0JaUktYT3FONm9MdkwyRQqj
+xwngpfw01c6sm8Tzr+sASyPwVsyVQ73K/phr95kliD5Ic1gywFy6+jhImMIFAGjs
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/vapid-key.txt.age
+++ b/secrets/toot/vapid-key.txt.age
@@ -1,11 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBVaUFH
-Z3ExeTVwM1JKY3lFM3ZYcThCK0VJOGFDdi9GYjdSMGNUWklZZ2xrCjNLakdoNWR3
-QkNxQk1LZFBMWXRZNUxPS1BDc003UUdBUHVmOTl1emxCSGMKLT4gWDI1NTE5IG9y
-MGl0akpyVGVYRUk4VnNBQWNzNnNvVWtDOVpLRnhrK2ZkYldxeGFramcKUzZJQ3Zy
-OTFkZ1JnS2Z3ZVNzMCtnbW9rK0xQbjc4cjFpZlg1VldIN1RucwotPiBmaDJ9KWBJ
-LWdyZWFzZSBEUW08UE1lIDQKY2l6V2RrY2w3YUtRCi0tLSBFSWhtSDhDdjJLamd1
-aFZJb1RKalJydUhPVHZqams1Tm9Yd1pvQ0wxY053Ch4kCQF+bav70skP8aNlLdOd
-G64goI5Bpmn9yGMUZ6TkaNYEhk1zBqJ8lEifDk46VDKbKp9uALv5mOi3/RTdVb4M
-mIKqpZChYHL4Zw0v
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBQWURa
+YjdqYnJSYStVMjlYQzhyaDhxT1ZiSTVjeWVhK3hZbkNnMWVlQkdVCm5Oa1JYdlJI
+TmNiWGFNbU42WDh4S0hUcGZrM3R6cjUycEUvSTFtZUR0UjgKLT4gWDI1NTE5IDUw
+VnNnTlNwaUpueFpDT25hZi83TUpJWmpmTDRDVnJuMlU2MWVVWmVsUU0KNnRBdXVJ
+TEFzWG14V2huRzl3QVh0d1dJOWZyeFdXYWhnMzdaNmpIYkN2awotPiBxcVpmJi1n
+cmVhc2UgcSAnImQvaE8/Cnk1RmQ5T29NSy8rK29hY3BMMHpWR2NSQURlMzIyQTVr
+dnlJL1dMdTkwaTVSWTlrR2JISnRFc01aU050VVdHV0IKVHMzWU0xZ01ZOWdKRWFk
+MDhLSDlRNFkKLS0tIEVuR1hsd0ZWeHVZb2NNRUFvU1FzSy9IWHJtVGFiWDNZZUMy
+U20wNFV5ZmMKjuIyKNS61RZrIEAj7A1RvUn8QmcNDXPA9r3Di18ki+TrMV1m55WE
+CYNnOj6hS4xEw8W2sbVF5FRj4sNN3VEHwXfknJiBJAz6ad50uEw=
 -----END AGE ENCRYPTED FILE-----