mirror of
https://codeberg.org/icewind/haze.git
synced 2026-06-03 17:14:08 +02:00
redis tls env
This commit is contained in:
parent
d87ee6ccc9
commit
7419a32685
14 changed files with 313 additions and 8 deletions
|
|
@ -1,13 +1,11 @@
|
|||
{
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
libsodium,
|
||||
pkg-config,
|
||||
lib,
|
||||
}: let
|
||||
inherit (lib.sources) sourceByRegex;
|
||||
inherit (builtins) fromTOML readFile;
|
||||
src = sourceByRegex ../. ["Cargo.*" "(src)(/.*)?"];
|
||||
src = sourceByRegex ../. ["Cargo.*" "(src|redis-certificates)(/.*)?"];
|
||||
version = (fromTOML (readFile ../Cargo.toml)).package.version;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
|
|
|
|||
31
redis-certificates/ca.crt
Normal file
31
redis-certificates/ca.crt
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIFSzCCAzOgAwIBAgIUeeghZlFLpiHZ4i5XoYSArRfBZEkwDQYJKoZIhvcNAQEL
|
||||
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
||||
QXV0aG9yaXR5MB4XDTI1MDUwMTE3MzA0NFoXDTM1MDQyOTE3MzA0NFowNTETMBEG
|
||||
A1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1zHa4DZDvV/9816BBzXb
|
||||
S/N9EWaZuFmkWy8XNcChMenZvHlOBoU2Ah+mcqBrbvpC4mmqCQVKK/URz8KU3ZlL
|
||||
bI8VGPbysnBcXatVCCNEC6AcE6ZP32ULAmnxnLMAaZnXDUv2qvB/WGBO82pNTi2Y
|
||||
JP814IpmvNLCr5P4ERu0qi0M1FRMKYN4lwZxJPm1QAeGcBMYqTy9P415LEcGqSHt
|
||||
4guowgdySSHk0MkeHpc5lkXP4Wh+0Z3dfr5honA/NndMRfEb00SMQM6WMKaPBzjZ
|
||||
59IvZRD6/SXmSXbnBOr8BnBQHTwshR12lhv0QX+iA53TenHwbNG4wEqR7mCRW8S0
|
||||
ugtw+7f1WmPXoIFUfzZhPr5QKN4a6NDp+7VJk3E2DfjzyMY4QVc8c4jiKZjLgdJW
|
||||
oTpN0RTzzL/kNHnYiruBUMPhqbijJJmHH57a1o+sDB7pR4CxM9JjwAEAp9cGuBUj
|
||||
JdSZX9aL1aEYt8PnoXuGAGripPXLS47AkOYs3uZfZFssu/HtoN0Qg8XEGZm87xQj
|
||||
UKZdHCcec84OaQHScWJ1yBjzTOcQsewymhwg/Uoan4Bq+m9yaBb4A9/ouh0WeOza
|
||||
oSm7gtY0tl4aM0TUqHddt8cSrvlGc2DXc2UdkPyzoxQftSbW6kBbgEOG5X0HKqIT
|
||||
2Yta7e4BiEYHV883R0lz3r8CAwEAAaNTMFEwHQYDVR0OBBYEFGifegOeUflLHL6A
|
||||
uWVeOyDgcNewMB8GA1UdIwQYMBaAFGifegOeUflLHL6AuWVeOyDgcNewMA8GA1Ud
|
||||
EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGIcOPQB9PSfqruSDX8jcJ/q
|
||||
uI3J0BEH+XkQ2v+4pJ3RQYMczUPRoKBPxqtN2R2G30zzjfEQkhBQAyNVP/dZ1I0+
|
||||
qaVEdgJR9gydJQGaaL6vaHyt6yEyyjCIpF8ZJKi0UeSJmwlfq2VR7BBDKSTppwT0
|
||||
ELuOrfsgyIFCWSWW1NkFEKlf5x2NVE0DVCv4/8xDXx+1Oc2JZFnnhZ9Im1j1yUqg
|
||||
H+oRB9feFR4YCItuXRO2mSPdmwvtZNPVSMwEPuv2YKolVZP6FnJt8/s8DKGhzM7U
|
||||
Xkg2xvoheVzMlVwWy7EUDzxYtGJYOO80AvHo5TQ6xdsFQ7b+hvytkBejOClDfxAN
|
||||
QPZaYKSmg+FdfOvwIfDzZn798M8DjRfTxp+7KZCOaVAulUbyrzWUdMKbnnPHbyA5
|
||||
67kcjKDY9jjnFbl5Nvgqh2hf/fWopM2bRJ9YqI8c7DnrSu7fYg4O1SJl6M8+ROYW
|
||||
F8qBXi8ncXdYApHJibQdrEHy0p2OlsGTOJezTD2jydny9LmNvhviDJLZpIcdLhPg
|
||||
ib1rEkXmIbUCueIdJATY1gWfN+6T7d1lU5ifznSryHFNk7obWJoCxh3eS10NUUsO
|
||||
y0jF3kCNSn8Uc5upgMKfqAeH9iUmnheVRbwGSNNkekJD9HPXeqVDdN68uRAXCx4E
|
||||
Oq+n5WQOPvSvw5IMlIXN
|
||||
-----END CERTIFICATE-----
|
||||
52
redis-certificates/ca.key
Normal file
52
redis-certificates/ca.key
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
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
|
||||
QlwIocgNC+s6KwWV+02rkVzn1rT8M9s=
|
||||
-----END PRIVATE KEY-----
|
||||
1
redis-certificates/ca.txt
Normal file
1
redis-certificates/ca.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
478FE4DB973CA6ABD6D97AD684DBD5B3564C28D8
|
||||
26
redis-certificates/client.crt
Normal file
26
redis-certificates/client.crt
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIEUDCCAjigAwIBAgIUR4/k25c8pqvW2XrWhNvVs1ZMKNcwDQYJKoZIhvcNAQEL
|
||||
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
||||
QXV0aG9yaXR5MB4XDTI1MDUwMTE3MzA0NFoXDTI2MDUwMTE3MzA0NFowKzETMBEG
|
||||
A1UECgwKUmVkaXMgVGVzdDEUMBIGA1UEAwwLQ2xpZW50LW9ubHkwggEiMA0GCSqG
|
||||
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKZvm4/tWR4mAq9bV59IeS8rWxu0t2WQeI
|
||||
NODF99+ou1lJmBap1OtTd618jzbEWNH/wIlB4jhbaqyLMdXDiLdbXclumjfU9/GG
|
||||
76AbceFX1XVksXzIdMESdub0ZdzqYdbi1hwXXfRNRIokUGBQS4Z5OqRBrJKS6J9i
|
||||
dzy6rVArxIQfRzaK2urQvqCBuoiob2x7sJyRjDj0kEAQHOouN+6Yporoda3A50Ca
|
||||
elZfxo/Q6eZJt6RppgM0Icp4+F5OF3teljVQIyktPkH6g+9fC+gP+VLon8Jfp4Ph
|
||||
+VZQNEj3EH8M9P+CuAZnw/NOsweD+pbjGbUD2/3rEBBwRKWikL4pAgMBAAGjYjBg
|
||||
MAsGA1UdDwQEAwIFoDARBglghkgBhvhCAQEEBAMCB4AwHQYDVR0OBBYEFElng8Se
|
||||
2ewVbMzURtIVfyCa6ovSMB8GA1UdIwQYMBaAFGifegOeUflLHL6AuWVeOyDgcNew
|
||||
MA0GCSqGSIb3DQEBCwUAA4ICAQBUyf0h8z3QZ5X6+fo9oDrNVdKOSlFLh/ekj7fc
|
||||
oaWCbJVQ14kvkEEjmHs9DnjStEix6Rum0ebWVs97xxMX3BQVtmAzcToXmV1kkNj0
|
||||
rMcNr+h8c2olnhNTgPMcdEIcYwokfoXBwIFM9qeEq+HwU84UpvOHzGeXGE+Emwo1
|
||||
GhCkn30bP2OEOHMU0Ei2kyMg3ogpIxViLJS714WnWnuPcrx8aB3LTz6sP65mGJOP
|
||||
hT4Y0CIl2O//AN/8fZjjGruXcYAo/ClM1VgVKPTlknf3mLZ7Y0/O9cLSQYtPwZGk
|
||||
Cxmsl2RFET7gUy4vhU9go0XNgInO/4sBs6sQSL80V2lf0NUzLCXRItUNLsKEZ9qU
|
||||
0AY/MDJza4ESNBrcCcuClhuHBRtkAqFL/4n5a+X+ddm/UnJHJQMMvoEBgyfT5C4a
|
||||
+eXPFexz9kJ03Qb9cSwPw0AUHamYzdVivOavWnk2QXbDzNe4tOQOGqjHt2CJVLC7
|
||||
09Xgsu3zOlEIMdeAk7ryUOz9+Hca+NUFliVpMGdKnHmUUKUnhRdsokC/2FZ1PEvI
|
||||
DaO7US9f9qVB0IX4hKSHAvG722un2F9gpwSBsXlL63lhkW/CwkqhMCyfcUSOtCNy
|
||||
THdLlaBwWmQiHkIL+ArQ+rFYEPH08ewypInsesIwTh4ZLm3WKyHsT5cXdUdS0kXH
|
||||
uPis/Q==
|
||||
-----END CERTIFICATE-----
|
||||
28
redis-certificates/client.key
Normal file
28
redis-certificates/client.key
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDKZvm4/tWR4mAq
|
||||
9bV59IeS8rWxu0t2WQeINODF99+ou1lJmBap1OtTd618jzbEWNH/wIlB4jhbaqyL
|
||||
MdXDiLdbXclumjfU9/GG76AbceFX1XVksXzIdMESdub0ZdzqYdbi1hwXXfRNRIok
|
||||
UGBQS4Z5OqRBrJKS6J9idzy6rVArxIQfRzaK2urQvqCBuoiob2x7sJyRjDj0kEAQ
|
||||
HOouN+6Yporoda3A50CaelZfxo/Q6eZJt6RppgM0Icp4+F5OF3teljVQIyktPkH6
|
||||
g+9fC+gP+VLon8Jfp4Ph+VZQNEj3EH8M9P+CuAZnw/NOsweD+pbjGbUD2/3rEBBw
|
||||
RKWikL4pAgMBAAECggEAAY6a6N2WVq8h+UKho5oKJEsXXbzTSZ+etgwIwffJsdpw
|
||||
cedTHqRY2RqzFsxilKPFnczlNsC0Q/PFTF7U8Pz6GCBXvoY+MWEPlm+n0NORSGPd
|
||||
KX9PYUVl/4Ey/qSn9z+gb7yg7lxr1t+qRmQ95sWQom8dOLTIqIup6jqA7kNgugLK
|
||||
ATPQIZ+J7XI779GJhnIE2UqyPUZq6Kk9wlV7MGSiaXHXRLiIoR4w6slZM862Wjvl
|
||||
yWP/V3aiOBgfSDpO5igdDQkNOPoNUehxMyCc0Q30vdnezBJw5B0fGh69tFiMPnql
|
||||
4+ZnTtHZxQaaE+KH488e5qWBMlF62xn/95U7a4EguQKBgQDpgOHWMXUYOm29eSlV
|
||||
y9NHsxKS9k0by/HTmwNV/fSDm9CJS4OX5HCOWkxjc4VGwHOp8hqfc3XHf+15vfKl
|
||||
TN7p77T/i5nd19gT0ulMtp4RCEG3SPAGCucdKzP08wobs2/bRuyiM6WLcvDiKhS4
|
||||
ppFHiSV99jl5Hy/JWMOOH+D1VQKBgQDd5wPMyko1RWn/BMWpsD4On2FtkRiZb/gA
|
||||
Lg8+GdeIDz28nB19tR49+6pF8tCQbt1NYBnlq04ZUFbSX1MCJCp/wUFixoM4Olqz
|
||||
aJvu6Fql9YzLox6zq9PXOzWEWxcW/kmKBbFuNKwemu4YbYNBvoRIyLIH67Gp0nc4
|
||||
J7x/0kwlhQKBgQDG1SZ5e/fXv7k+xHN8SWoJ/eRtHCqg5tNveuomSW/yubWjk5fk
|
||||
uXNW5HFzpiTxEGPtbOlaqbi7PqX7KtH6DDEtRx77E+bbzzaB+vEKj96dZkh/SC6L
|
||||
FrGiVu2RQXt0ByHSuNw7ansm+aNBEtA+RCgloBU643YhO3s3msw6s86dWQKBgHw3
|
||||
K0tiGbRETRdyRmu8uqBY26MHy+toYD1Ji0LKGHqTfY2tHl0WG/26eRB64gFX7g24
|
||||
NAb6o9dLv643qjHSqO+m8MEoOqApGki/0DomW0f3cn8zqqYNE6KyBD04+G3onqXi
|
||||
lfYJCih/tbR66TTOPyK3JeGFMIjNxerrY3tx7yo5AoGBANnt3tWS3AMhvj2lzt6T
|
||||
ILjKMC1Ker49BwCYAuIHPON9Garqu28OXTDBq8zd9NjgewtZgM7OTwEbsSgwbXBp
|
||||
4t2u32s6Ao8CohaKYIWolzqnuLF75p7VPuUP+EiaKQdzbbTrSrtPWB6+9uSTZSp7
|
||||
Jg4q5I4X0o5MLslUDD3EGXfc
|
||||
-----END PRIVATE KEY-----
|
||||
7
redis-certificates/openssl.cnf
Normal file
7
redis-certificates/openssl.cnf
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
[ server_cert ]
|
||||
keyUsage = digitalSignature, keyEncipherment
|
||||
nsCertType = server
|
||||
|
||||
[ client_cert ]
|
||||
keyUsage = digitalSignature, keyEncipherment
|
||||
nsCertType = client
|
||||
25
redis-certificates/redis.crt
Normal file
25
redis-certificates/redis.crt
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIEMTCCAhmgAwIBAgIUR4/k25c8pqvW2XrWhNvVs1ZMKNgwDQYJKoZIhvcNAQEL
|
||||
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
||||
QXV0aG9yaXR5MB4XDTI1MDUwMTE3MzA0NFoXDTI2MDUwMTE3MzA0NFowLDETMBEG
|
||||
A1UECgwKUmVkaXMgVGVzdDEVMBMGA1UEAwwMR2VuZXJpYy1jZXJ0MIIBIjANBgkq
|
||||
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzrKoci1Pj1mZr5eQCqH3GBYhJyucVkn6
|
||||
uPaANs5srjM3IrwopWmkU1lVdfq+53JqOw9zW/1Y8rJCuvtW02OSonCKd/WVq7aU
|
||||
6XAnYACaN3l0OW38VV/Zxz6kZVnmfmk73OSNLr8sbB5tnSq0B0hLQBbFf/EJS+Cr
|
||||
FHN+nbhzxfidqmSNb7UEXDVNwC6RiVN+TK72KuAF/kC3i7lUT0sOAEA9cFfMlJDX
|
||||
pg/4xdC2Q5Wl+ow7Rx9J71mcbL0mqVzx5vkW21ohw472SZK1G6BbG8LstPoFLtHD
|
||||
hF06RlekcluDVtRA3DhmMYuf0FYZWpeu7V3ytf3ZScgKPi6cyV5raQIDAQABo0Iw
|
||||
QDAdBgNVHQ4EFgQUZr/He3WzMPdrr0ytP6Nb8vVPmL4wHwYDVR0jBBgwFoAUaJ96
|
||||
A55R+UscvoC5ZV47IOBw17AwDQYJKoZIhvcNAQELBQADggIBAC0UR3/0RraqCSh1
|
||||
TcTN5T3l2zfBjWwmOOqUAV9wvWMc2gdqvTRPZvua+avRqmWAtogcvw0l0hBPNg6I
|
||||
ehbt/nBZaxNaLQd4ivT7X8mberUQepHYACjtX0ByHsbeKSvAUgtu9TBR8MCaBntG
|
||||
uQcZ8X3q8yh+Pioqg9FtLRfjn6MmLBXPOhKqJOKj0Eu3LW0EVVOe7UF5BehsT43I
|
||||
K5Kf9AjLSKf1UJ/Mwur0UZCERHxzabsXYtiEfrL4TWv8wq0B805aolF+KFAQ9TyE
|
||||
zQOXE0KyeaeA1Bq5HtGaNMR685C5Vly34ja2zuijEgyed8FxYxnxR7wR4ReHiY1B
|
||||
YBoax2FVcWt8jqJVCGNzJx5tJclCHvYR1wK0v87BMbdtzskAPoFtI7h8EKKwZCBX
|
||||
ZXhXQl/J0rnKmP5dzjJljU1MPmxRVeFGXanSx28M9t7RM46EBQ0cTssKrABCq38R
|
||||
V0e7Qb7I9/9N/KTJQsQSRo6c6r12mYOsMsOih+yaJCoz1rRR7jfV1dSBoSP5dm3f
|
||||
Vpohp8ddELLwL45uUSExnS9FNjPwsVKli/BLmE45NBMeE8uVUBjhT2PULliJiwSo
|
||||
gJ4ERZ1VFPubnVIjqwLWAx/S8p1dRlHLtQhBMAHOa++fPbvGcP99exMCJl5JmVDS
|
||||
S6ndtuPssyYRm6QzY00ZsTLSNOTU
|
||||
-----END CERTIFICATE-----
|
||||
8
redis-certificates/redis.dh
Normal file
8
redis-certificates/redis.dh
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
-----BEGIN DH PARAMETERS-----
|
||||
MIIBDAKCAQEA1GAl2XdbmBJZro8/29d3CkovYmLNjpDThVxXggGxkD6U2kDzNzRo
|
||||
cwX2H8b9+w8QQXiBt7MUBlErHdhZE+C7b7JYX64m6hfNMHoOul+t25e/18CU6Odk
|
||||
qeDi3GVsEGMYO82J4Jowj8nPeoLE8EQh93Gw/rfMS3G12YxjC9xO83cP8KzjOB6R
|
||||
FAfh+n24Z0E3ckxrYEJoU5GchtM2qrf7lNzxjW7uTPhakuDWGAgcovLNupmIEAfa
|
||||
b2kR8Li8I2vhFoyj0zmz5pIhkmfmROWtXfZd5LfS3DnZZXJSbMGdl/QEnUPSeLSB
|
||||
XmrCgMXeiT42tg05ZeEWKL/jYBQ5Hd1drwIBAgICAOE=
|
||||
-----END DH PARAMETERS-----
|
||||
28
redis-certificates/redis.key
Normal file
28
redis-certificates/redis.key
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOsqhyLU+PWZmv
|
||||
l5AKofcYFiEnK5xWSfq49oA2zmyuMzcivCilaaRTWVV1+r7ncmo7D3Nb/VjyskK6
|
||||
+1bTY5KicIp39ZWrtpTpcCdgAJo3eXQ5bfxVX9nHPqRlWeZ+aTvc5I0uvyxsHm2d
|
||||
KrQHSEtAFsV/8QlL4KsUc36duHPF+J2qZI1vtQRcNU3ALpGJU35MrvYq4AX+QLeL
|
||||
uVRPSw4AQD1wV8yUkNemD/jF0LZDlaX6jDtHH0nvWZxsvSapXPHm+RbbWiHDjvZJ
|
||||
krUboFsbwuy0+gUu0cOEXTpGV6RyW4NW1EDcOGYxi5/QVhlal67tXfK1/dlJyAo+
|
||||
LpzJXmtpAgMBAAECggEAC9w7hyWrcYXKKEWxmbKWe5bVeypo85iWHuPiEoMAwHQm
|
||||
30LdsDQiHjg7i6QCLUSm7NGjpG0im/Z3lsQSRNnrUY/UmjKIzowQ+l4ZnEwcjT9W
|
||||
WG9DseBoniKtizU/4RQHv9KLeVm14lRSpNiM8PgIfVpxJbi+eFChcHB6HPG3Du5t
|
||||
MauRnRpRXP7Yd9mQ4hmEQnEirfZZb2kBXYIHmJ0YwRlk242R/JqTu0MNKu8+JE6d
|
||||
OXZ+dq5DCDoNqPIwLnFbly5l2gpCzLezRJhxiSE2amUNk+0nlfzJdDjF3xT7YIpp
|
||||
8kutalAU7wjXc/RR4TD21uT2y8RpKq0WL0F6/gj1YwKBgQDrdoA2e5YExRm/opv5
|
||||
jC364GrucHjlzzhHqY+JyZNQ1FLdNcAZyOV56u7mCwmDf5G77Vi95Fbpf0O1X+lW
|
||||
r/1nmWQBvU0CVABXl56+ZTzPp8Kh2cizJlHxuZ5XhKGZPaJ1J+uVYplDkEUqnQ2G
|
||||
dVQ5ynOP00KN3NeQ5BLzmON/EwKBgQDgueG7wzaOFg4liZKuEXlbzjNGdBzCdZkL
|
||||
vh/G3tmmWk+c0fbvIhZtTBynK57KO0RhUMko9aztdUmdMAh15owpbZzos7VzpbYs
|
||||
TqZQZc3O8XeqZwFKvUiuj+DiJ2SGhjCqeLqaHcmHpZ0Ecjw6s8hocygVkc8krzGz
|
||||
S6FyjqqvEwKBgC/MhoqI3BNrz6ZPZEpsYokjNZHh0ykTv+EMUs8t1HH8KDYvyydw
|
||||
2OS/BHA+nVfMddEohXNG/z23UA9pwPyQDWkSgnK38wId+1PMu7T66DVfYOtqQovb
|
||||
o5bmj3ZEvmlVUb1mtTRGJ8bHasMTzsMU3lw89OilgkU6J6iKJC6/Qq9xAoGBAL+g
|
||||
QcimMcL/M5j2sskTxXRvZHHTWSLIvHSy7s3aAaZEpFaJBBPt8UnJ+TTjkUfJOgnx
|
||||
pVb0Bz2FIfyTlONUcHhzK7WSaEvxJmKpvlAYP2MTrIL1yrg8p9mSfqTaCnJbwuva
|
||||
fuQkOlEc+8Nq1ckIvP+0Ep4x83zIl4zYFRdmaE1ZAoGBAKl7712xOCYDE6pxRrDK
|
||||
+pXXsjIvQY59vfbcZXHqr8OqtelYCkqbczEVE/RiequX16ZxMPAR2w09Lm/VmJzk
|
||||
sKcRgdeJhnK+Sqw5zYzFJEJ/FrgYO1K+ZVmHjnN+/y8kfX5Z6xPwcFnw12eHqu9+
|
||||
9cCUnfu2HJPRJdUkUAlvFYdF
|
||||
-----END PRIVATE KEY-----
|
||||
26
redis-certificates/server.crt
Normal file
26
redis-certificates/server.crt
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIEUDCCAjigAwIBAgIUR4/k25c8pqvW2XrWhNvVs1ZMKNYwDQYJKoZIhvcNAQEL
|
||||
BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg
|
||||
QXV0aG9yaXR5MB4XDTI1MDUwMTE3MzA0NFoXDTI2MDUwMTE3MzA0NFowKzETMBEG
|
||||
A1UECgwKUmVkaXMgVGVzdDEUMBIGA1UEAwwLU2VydmVyLW9ubHkwggEiMA0GCSqG
|
||||
SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj9rRzZejIFKPkQa8qyy0bsPib/MjlZpZz
|
||||
eNqfdGfWTmwqokUQAOuPL6Mn0cJKT3bua+jo6DeJn3p3jM6++PcJorv4NI+uZAT1
|
||||
RKDEzYz23JtMVP81Q7pM8H14g3XpZWwCKhec7ocKb2gHT4mrL8zFg4M2kFkDQ3FH
|
||||
FUbirQsrXVTx4UT4Pj09GA0sujJhdru/f/CgkOTj/oJ4JVk9YY8lDjz479lC3YMK
|
||||
+Mlit2kNNUSXCWP+m/eLMBVZIHjuZZYa94E6mvgw9ExDgi1mpJjwZKP7y3bAP1ib
|
||||
M6AoHDqQyKUe1SbwGrNWRgsVtlAlshJi571c8/qabNSFWptxyAKlAgMBAAGjYjBg
|
||||
MAsGA1UdDwQEAwIFoDARBglghkgBhvhCAQEEBAMCBkAwHQYDVR0OBBYEFP81jIYo
|
||||
TayyJ4ReOnr9kWYi/CgVMB8GA1UdIwQYMBaAFGifegOeUflLHL6AuWVeOyDgcNew
|
||||
MA0GCSqGSIb3DQEBCwUAA4ICAQDKIk8Ett45QhJs0rsuDyTcYYngx+TbZkOmCONA
|
||||
kFAC2Dk/Kv1geLV0hIRvcUDXewkTwSZPnmqI9yiOdTB1xTOyftmXXAGUSVTSNSCB
|
||||
hk6K5CxvUyKC48/mJQVq/mVIBYpH7/TF1/FX4OCa5ZyQtyCnq1yEXSWEsWoObTqV
|
||||
e5HKFM81ppsopLTRp7FtIpNqv9Yn/KRrse1ijwC8ty5DaH+4j9BiGZbRHl1j4jRz
|
||||
5IxqcnCrFY6sw1m4w/YfLv0gq3iMRzL3FKpOLZYxIyDqfQAR9WxZ9RVaDdf/4H9Y
|
||||
qrcWf9shPoIt9Lpwbgwy378rcBDIklxrhTNvYaCnw58AyjI+BuFdlmomsoaxqRxm
|
||||
W50/mju6UWG8jYnb11fHpZi55YuBcqBz3FaMZL8pUg0EOswS9yowNBZZaTTNMXV6
|
||||
BiAbkdDMXhMTuLwgBzmPI5znIkNJsQAYD80d+AqeaVkDebpld8ONDA28vlXMglwN
|
||||
nhvaBy9kdaUo28NI16WBY6gXnse1H6d0Rdp/pvBjeUOtv+lvdSx5+gC+yk0SZ63L
|
||||
urT+ZVgP8NN1EPJ2w3CUoqflSdRsqukEjeuCsIO+6VWFWz7lVJAYf/5OSVqg1FEn
|
||||
AZVGo7J/eR/MfcMh0b/3w9zcd3t0nKa1NE+WGykRfBWs3vYULPRzaQt6wtzQ3wHY
|
||||
UP4BVA==
|
||||
-----END CERTIFICATE-----
|
||||
28
redis-certificates/server.key
Normal file
28
redis-certificates/server.key
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCj9rRzZejIFKPk
|
||||
Qa8qyy0bsPib/MjlZpZzeNqfdGfWTmwqokUQAOuPL6Mn0cJKT3bua+jo6DeJn3p3
|
||||
jM6++PcJorv4NI+uZAT1RKDEzYz23JtMVP81Q7pM8H14g3XpZWwCKhec7ocKb2gH
|
||||
T4mrL8zFg4M2kFkDQ3FHFUbirQsrXVTx4UT4Pj09GA0sujJhdru/f/CgkOTj/oJ4
|
||||
JVk9YY8lDjz479lC3YMK+Mlit2kNNUSXCWP+m/eLMBVZIHjuZZYa94E6mvgw9ExD
|
||||
gi1mpJjwZKP7y3bAP1ibM6AoHDqQyKUe1SbwGrNWRgsVtlAlshJi571c8/qabNSF
|
||||
WptxyAKlAgMBAAECggEACytJZuRV823h2DECmLIByaAdigAHQ1vgpc8MEs6gKtYU
|
||||
F4y5kvnXvLJBtVBcTCmWRW7ZDSc8bps21sv4YsPyOBgmISXwylq1Mmv8CPajl/Fh
|
||||
LCr3aOPLM2XdINzQ/Gwp67UoVKAJrOlNNypGNitpvI6qh93/YkcxgTvEJLl68veA
|
||||
V/5SywFw52YFFVGSKTWk9Ht20+/hE0bG4PbiTBmUH2vQYV2j68OwFA8/Th4KK1au
|
||||
e7GEYJ+e+0xArJ4jRrD51Rb7G7O/EV57UvTYJZrGOufOvxU5OCj3dMmLyhrNgmSG
|
||||
T+DGht2DJWGHLlEuu0HxYUbxA/O/T7/qRKa3eFqBpQKBgQDX8AFkSL5igUCs+/+4
|
||||
JB5ptA1xgjYN3xfGxJDEtGEmMRCFgnFYOmJzY4Tb23DLI1vmcrt404tssUApIKQQ
|
||||
WOJNDf9ykn7P39cupNgxwBCDtUcYu9lrk8TCJi9tREUFHKgf0b9aRKLKcW0U5uiJ
|
||||
4g+CDV0Tf4KSlz5tAVBjsknYkwKBgQDCYjE40pSFuMmRC+8NkT/h/QyUXrX+/2eh
|
||||
2r2L70CB0i5kuaRfWW8MEzh65a536U2mt4/qs4+jUo4dmcoToUrAwsIa2cv8SiTH
|
||||
ch4d1v/5dPQfrgvoRJJPyTJFEZreEfjp0fHcNhp1X0tZPiuMF79tpdx+sQjaq7NT
|
||||
R4FZ66/S5wKBgQC2xI+JAAEUgu3o/EoO45NSSHFwd5Ok3gTT2h/mPf5UQwcG2cdx
|
||||
s8kMfVlAdVXcugrY3JdMx1ClKMlzhgsXQwQX0Bc8ND5dV8pb0m6ifTv9HnwUtTpr
|
||||
UWEiKwvNYhFBKGYsuG1Ly/g1fRekr2R2//28R+9Vx4EO7jCKNqiCGa9jPQKBgHtQ
|
||||
n7lUnjRXDkieMYGB6+0KA7j8fKjQjoX3ptfnaBzzocr0mnqC2hfm+aW9n/kiYMir
|
||||
Gvnh//W0ocPVlITvheTTqSAvm2DqCHsewkxb4Pf4YgbW+2bWWZuUH/gBOyY2cJql
|
||||
PbJeAFsFoV90OVwelKqS1lbpKJzQ4GqsqjrJcjlxAoGBAJkgFZTJ57kZyYKYEm0a
|
||||
CU7qdy25VzoOzh5HZGuJ7QTVNBJpSPtm1Mv5/POR5swLzqVCWHddwUOxWuErtPwy
|
||||
iFCFQhYKwlpfKV/fKpWUzSMWSbXwYzsqGJwcOsyBd4lSxElsWj6sDON9l6LHfQcq
|
||||
umJV5KsCDP6WeLXxlYictEhD
|
||||
-----END PRIVATE KEY-----
|
||||
|
|
@ -584,7 +584,11 @@ impl Cloud {
|
|||
let found_services = labels
|
||||
.get("haze-services")?
|
||||
.split(',')
|
||||
.flat_map(|service| Service::from_type(&config.preset, service).into_iter().flatten())
|
||||
.flat_map(|service| {
|
||||
Service::from_type(&config.preset, service)
|
||||
.into_iter()
|
||||
.flatten()
|
||||
})
|
||||
.collect();
|
||||
|
||||
let mut service_ids: Vec<String> = services
|
||||
|
|
|
|||
49
src/main.rs
49
src/main.rs
|
|
@ -8,11 +8,13 @@ use crate::exec::container_logs;
|
|||
use crate::git::checkout_all;
|
||||
use crate::network::clear_networks;
|
||||
use crate::proxy::proxy;
|
||||
use crate::service::Service;
|
||||
use crate::service::ServiceTrait;
|
||||
use crate::service::{RedisTls, Service};
|
||||
use bollard::Docker;
|
||||
use itertools::Itertools;
|
||||
use miette::{IntoDiagnostic, Report, Result, WrapErr};
|
||||
use std::env::vars;
|
||||
use std::fs::{create_dir_all, write};
|
||||
use std::io::stdout;
|
||||
use std::os::unix::process::CommandExt;
|
||||
use std::process::{Command, ExitCode};
|
||||
|
|
@ -369,15 +371,56 @@ async fn main() -> Result<ExitCode> {
|
|||
.await
|
||||
.ok_or_else(|| Report::msg(format!("{}-db is not running", cloud.id)))?;
|
||||
|
||||
let err = Command::new(command)
|
||||
let mut command = Command::new(command);
|
||||
command
|
||||
.args(args)
|
||||
.env("REDIS_URL", format!("redis://{}", ip))
|
||||
.env("NEXTCLOUD_URL", &cloud.address)
|
||||
.env(
|
||||
"DATABASE_URL",
|
||||
format!("{}://haze:haze@{}/haze", db_type, db_ip),
|
||||
);
|
||||
|
||||
if cloud.services().contains(&Service::RedisTls(RedisTls)) {
|
||||
create_dir_all(config.work_dir.join("redis_certificates"))
|
||||
.into_diagnostic()
|
||||
.wrap_err("Failed to create redis certificate directory")?;
|
||||
let redis_cert_path = config.work_dir.join("redis_certificates/client.cert");
|
||||
let redis_key_path = config.work_dir.join("redis_certificates/client.key");
|
||||
let redis_ca_path = config.work_dir.join("redis_certificates/ca.cert");
|
||||
if !redis_cert_path.exists() {
|
||||
write(
|
||||
&redis_cert_path,
|
||||
include_bytes!("../redis-certificates/client.crt"),
|
||||
)
|
||||
.exec();
|
||||
.into_diagnostic()
|
||||
.wrap_err("Failed to write redis client certificate")?;
|
||||
}
|
||||
if !redis_key_path.exists() {
|
||||
write(
|
||||
&redis_key_path,
|
||||
include_bytes!("../redis-certificates/client.key"),
|
||||
)
|
||||
.into_diagnostic()
|
||||
.wrap_err("Failed to write redis client key")?;
|
||||
}
|
||||
if !redis_ca_path.exists() {
|
||||
write(
|
||||
&redis_ca_path,
|
||||
include_bytes!("../redis-certificates/ca.crt"),
|
||||
)
|
||||
.into_diagnostic()
|
||||
.wrap_err("Failed to write redis ca certificate")?;
|
||||
}
|
||||
command
|
||||
.env("REDIS_URL", format!("rediss://{}", ip))
|
||||
.env("REDIS_TLS_DONT_VALIDATE_HOSTNAME", "1")
|
||||
.env("REDIS_TLS_CERT", redis_cert_path)
|
||||
.env("REDIS_TLS_KEY", redis_key_path)
|
||||
.env("REDIS_TLS_CA", redis_ca_path);
|
||||
}
|
||||
|
||||
let err = command.exec();
|
||||
return Err(err).into_diagnostic();
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue