diff --git a/homelab/fighter/config/zipline/secrets.env b/homelab/fighter/config/zipline/secrets.env deleted file mode 100644 index cc708729..00000000 --- a/homelab/fighter/config/zipline/secrets.env +++ /dev/null @@ -1,60 +0,0 @@ -{ - "postgres_POSTGRES_PASSWORD": "ENC[AES256_GCM,data:8Ecq1w9kYBhi4LW+IREqFYzyt68NZoDxxJ+Q2rbcVYh5CBE1xvGjaQ==,iv:TXcJe3USSQ7R8ol7rxGngBl82NVERF0AKSI4pRETSRg=,tag:GfUJ2Tz6naYhTbPgs0lpyw==,type:str]", - "zipline_CORE_DATABASE_URL": "ENC[AES256_GCM,data:HIv0ytmB5fYRXmf2bXKcB9NivUSGCa/UlXznJ3KrkHpiRPihNQRB+Ux7QR2e7++AzH/PBJHCWVAENvDLeREFHGD5ZqTN4rL31QriaQ==,iv:1syjaMBIC2WfvN8fdmXX8p326hmOdP8qCuxZQSkUzx0=,tag:kssYQkEPjm8hRFkyIxm8Yg==,type:str]", - "zipline_CORE_SECRET": "ENC[AES256_GCM,data:OgEx5qj0zTTJxu68eqb1MJsK7lF952tWmu2Jnyd9woj1DemsMPA5jg==,iv:fBWUIdiDAE4onSRoa/T2hOb8sVi6cR3RVKnfHjsfmG8=,tag:4l4y+9XgWt66RL5GdwZlZQ==,type:str]", - "sops": { - "shamir_threshold": 2, - "key_groups": [ - { - "hc_vault": null, - "age": [ - { - "recipient": "age1zswcq6t5wl8spr3g2wpxhxukjklngcav0vw8py0jnfkqd2jm2ypq53ga00", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkTWhISnV4S20wc2MrbS91\nWlBrQ1k2VmtGUlkxOVVheURtYzhqQzQzbmdRCmFJWGpFQU53emU3a05NQXp0SG1u\nZW1xMUtzOTYzTHhGc1pNVGY0eFpUemcKLS0tICtFald3TVovb3UrVXhYYXduSU1O\naWNQVU5wN094SHNkVU1kaXk2QVhMSzgKiMU/ZinrQsxsd3r2r5180VhvouzTS0lU\ngjp4rn+VwDTW0VzWWF9GplrE780UaIHGcJXIROuWROgRX0okiHHt2J8=\n-----END AGE ENCRYPTED FILE-----\n" - } - ] - }, - { - "hc_vault": null, - "age": [ - { - "recipient": "age1zswcq6t5wl8spr3g2wpxhxukjklngcav0vw8py0jnfkqd2jm2ypq53ga00", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWL05QTFhxOTUxU0FqTmhW\nQlBXbTlvTzVpcFA2SUxYczdEYVZCNmQ0aXdNCnZBMm1SR0hlZGhhSElEc0ZnVjBX\naXA1NlJ1L2FLK3FWSHFRcFliVWlqYUkKLS0tIGVkN2V5VzdYVEpBV2F5UFlPaFRV\nbnkwSDRSeDc1Sm8wZHBjZmpCSzFkYzQKH664oc0ykdHvZctXa+RwQK9mrrpSwqdT\nvXnA9pdJ9JO/bjx1ucVBcOZqDwKxgS6ugq169NoZpaOGzz6pXXtd+/Q=\n-----END AGE ENCRYPTED FILE-----\n" - } - ] - }, - { - "hc_vault": null, - "age": [ - { - "recipient": "age193t908fjxl8ekl77p5xqnpj4xmw3y0khvyzlrw22hdzjduk6l53q05spq3", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNG9ObStXVU1NdFNOQk81\nTFBaN2EwWEY1OHM1Q2FFcXFGWDhnYU1mRlU0CkpHWlJYVnk4VnAyK21TZUdIR3hq\neTJ2K1dpZ1o5MTNycFE0TzM4UFp1bkEKLS0tIElFZ0xNRU9yaUg1TlMzbzIyM3pj\nbXd5bmJDWm5ZcnRmMkNyc1dKWTN5WUEKaNwBc7ECUaTSks35k//p2qXPXo+Zjw/P\n465Rs23l9FjqaVhBSvp1bq7OiSoajH0WskmIJ209AIpYG8Znbrcjqok=\n-----END AGE ENCRYPTED FILE-----\n" - } - ] - }, - { - "hc_vault": null, - "age": [ - { - "recipient": "age13prhyye2jy3ysa6ltnjgkrqtxrxgs0035d86jyn4ltgk3wxtqgrqgav855", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLZ3ZKVTdoVFp5aTRxblRY\nSTNYWVBudnlJcDRIaG9SQzN3QVZBZGlCRVVRCmNFUE0xa0RmblZuVWROa3VnT2Rw\nYjBMMjgxdHJ4S3hLMVdBOERXOU1saGsKLS0tIFdKMXhqclBFTnp2QWFqSUJ0bEhp\nMkxGeHJ0UnRmVHZKNXpzN2trVUpTZ0UKsjWoPY6pgXEg/TMvhqGyQ4AVlIARVix8\nJr4/uEky5z5rnA4TApIkeTu63Z+1OwVJaeMI6AAo1Pov5Vvz+/bWhto=\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1n20krynrj75jqfy2muvhrygvzd4ee8ngamljqavsrk033zwx0ses2tdtfe", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmSWE4ekdTaVdoNy8xeGhx\naDNlTlB3V2N2MFhHMWZ1N3ZKNVJxMzU2ZERvCkQ4ME5BcjB6UDhmbVBSOTJWd05E\nV2pZVTZTc1BBQ2E3aHpURFN2Q3NCQUkKLS0tIER1RkhKMVRpN01GendwVVYyU3VI\nVFB1SmZRSEZsV0RjRmpJb3RzK3NxWjgK/jC7V6GtoPeFnQfjud5LXLvrYmAoJCUw\n6W4L5B89IyrYzJ0jYzkvxwy7bMbE79sG6ykggZ9cJwi8xe+9dolX5Yk=\n-----END AGE ENCRYPTED FILE-----\n" - } - ] - } - ], - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, - "age": null, - "lastmodified": "2024-08-29T21:27:20Z", - "mac": "ENC[AES256_GCM,data:sFknEWVeXnZzPs/asU8ZUvjGSaEAb2eKVmu/L4W2Ph8Xy58NqoQTo51LqBcAUTzea72r+kfxUpOo9/0ID2AEwN6HaJbWyPKlzvEiHy7OuHz0XBjMV5PYAHFzMJMrWQBJ4Ia/WDaw8L2DEBMS1xkrVDN9/LYvqsPsuhoVnRX59YA=,iv:rNvuT8MvZjVtQBYL/1uK+Y8dnsipWeLF1RKU06Wds2Y=,tag:RzDkLuv7UoABA2EwsOy3tQ==,type:str]", - "pgp": null, - "unencrypted_suffix": "_unencrypted", - "version": "3.9.0" - } -} \ No newline at end of file diff --git a/homelab/fighter/config/zipline/.env b/homelab/stacks/zipline/.env similarity index 100% rename from homelab/fighter/config/zipline/.env rename to homelab/stacks/zipline/.env diff --git a/homelab/fighter/config/zipline/docker-compose.yml b/homelab/stacks/zipline/docker-compose.yml similarity index 89% rename from homelab/fighter/config/zipline/docker-compose.yml rename to homelab/stacks/zipline/docker-compose.yml index 77923ada..2403e163 100644 --- a/homelab/fighter/config/zipline/docker-compose.yml +++ b/homelab/stacks/zipline/docker-compose.yml @@ -19,8 +19,8 @@ services: DATASOURCE_LOCAL_DIRECTORY: /uploads UPLOADER_ADMIN_LIMIT: 25gb UPLOADER_USER_LIMIT: 100mb - CORE_DATABASE_URL: ${zipline_CORE_DATABASE_URL} - CORE_SECRET: ${zipline_CORE_SECRET} + env_file: + - zipline.secrets volumes: - $DOCKER_DATA/zipline/uploads:/uploads - $DOCKER_DATA/zipline/public:/public @@ -41,7 +41,8 @@ services: environment: POSTGRES_USER: zipline POSTGRES_DATABASE: zipline - POSTGRES_PASSWORD: ${postgres_POSTGRES_PASSWORD} + env_file: + postgres.secrets volumes: - $DOCKER_DATA/postgres:/var/lib/postgresql/data healthcheck: @@ -53,4 +54,4 @@ services: networks: web: external: true - zipline: + zipline: \ No newline at end of file diff --git a/homelab/stacks/zipline/postgres.secrets b/homelab/stacks/zipline/postgres.secrets new file mode 100644 index 00000000..27bdb280 --- /dev/null +++ b/homelab/stacks/zipline/postgres.secrets @@ -0,0 +1,58 @@ +{ + "data": "ENC[AES256_GCM,data:LXYXdF9/SKG0/iSwMjSd//C+oyTvsHE6kWhrFpKREkK6TebxBJtO9hLMXlF1ZBMqfFv1Tntz80Ni0w==,iv:ajlci1uiUBtePy/QpFU+DfEvKO4U1GDPtu65lnA8PHA=,tag:i+TpCRzitfr7AkOx/0wz0A==,type:str]", + "sops": { + "shamir_threshold": 2, + "key_groups": [ + { + "hc_vault": null, + "age": [ + { + "recipient": "age1zswcq6t5wl8spr3g2wpxhxukjklngcav0vw8py0jnfkqd2jm2ypq53ga00", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBueFp4SFVlVzg1RHorUzBp\nRnM1bXpoeFFuMFpVb2xDc2hWZVVkRFZDTkM0ClBwMTZSYXA2S3lXMzBBekRKelFy\naXNjcGhuaGtBYTRUMlVVQVVTeE9CNnMKLS0tIEJpM21ESjVWZW1aVC9EUnJoVERQ\nLzB3eUt2bXRvdUE2c2dHYWZUNkFSbnMKi57PWC5o9D2bVj3y44VE9mYojyuXMZDs\nfnni3VWclS0M8DgYuNsTx1Hp/zCTbbiENO+etKCQS1ezbMCk3yGsbag=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + }, + { + "hc_vault": null, + "age": [ + { + "recipient": "age1zswcq6t5wl8spr3g2wpxhxukjklngcav0vw8py0jnfkqd2jm2ypq53ga00", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2eUhURDJ2cXpKaVpZTTNI\nQXFBYy9namZBSzM4Z09tWXV5NzQrM2VlUGxnCkdLT0ZzSnVvb2tyZ3NZeUllZitX\nUHpTSG1jNFVsU1d0MnhHN3EyK05ReGcKLS0tIFNaRENSbGVLaUZWVjh5S0Z1RVBN\nSE5pcVZLeDlaa0c4UmFEZ3pZN0Y2UWMKDpfKj6hDeZsFniIEKaaQ9YUx1JZkqEiC\nIFTdh3KFxPtFShpG1rP5P/aN+z8/Iqx3wrdYSP7T5Lk0uHRSKPk5FDs=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + }, + { + "hc_vault": null, + "age": [ + { + "recipient": "age193t908fjxl8ekl77p5xqnpj4xmw3y0khvyzlrw22hdzjduk6l53q05spq3", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4OC9XVjBVQzVRNGE1M3lB\nQzluWnp1TnZXN3libjVoN05PUDRXa3lQckc0CklhbWlzcnhNVmNXbkU3Q3BzRUtS\nSXJVUzg2Rnhtc3RQdmg0NnExbXJIUk0KLS0tIGdnRXNNb2pTTkxDSGVlejNJcjBo\nTFhiWlB6WlFxWGFKZ2JlSnhGKzFDbnMKCb7Nva0zHg0XAe/EtBE0777qsasrgW44\n8PO3mH/zTpRG3SCBR2bHiUNtkRe5AtPOFR9bY4v1QSAmcbmNYPzeK88=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + }, + { + "hc_vault": null, + "age": [ + { + "recipient": "age13prhyye2jy3ysa6ltnjgkrqtxrxgs0035d86jyn4ltgk3wxtqgrqgav855", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkUDF3R0hJMTg4MldZLzdY\nWHZKdEg3a2QzQXR2R0hMZ29tZGZzTGpGa21rCllPT2NsSy91ZEtkcEMvNDhjcXZY\nV0JvNDVxaVIvUGJDdXQ4dkxhSTNvNkEKLS0tIGdrN2RnVnUvQkkybFREbjhmOUhM\nS2g2RmRIcUtQcDlMbTB3QTVsTi9saVEKbDkCBy0FeICmKDYvdG+thxHZ5+mLntgn\nFpd59oPja2APrT4XYMGf4BaWNAQn5zp0h0SO/ViyX7Xcxa1nudZEALo=\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1n20krynrj75jqfy2muvhrygvzd4ee8ngamljqavsrk033zwx0ses2tdtfe", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5Tk9JVEFNNFR0RVdKSlBu\nUnNrTXB1Ym9uMkUzdm1PNFNlelAvTjlpYUFBCjVBd3lhUlJDcWNQSWV0L0lyRXdV\nVHQvUWkzRE1pa1JlU2E3K0lQajV6NzQKLS0tIDVlVzcxN1ZuNEdNL01jaStmVU1E\nUlF1dkFEbEo0M1RIcXkxQWFQYWJVbFEKaocLJxEibp6UnXTefY6tjk4MOfmzHmmL\nWsYrL1OoswELCJzxUgXcet6MNsDfmOtNlexXLeEVyDcGXvfHPP7SAsc=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + } + ], + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": null, + "lastmodified": "2024-10-08T18:55:02Z", + "mac": "ENC[AES256_GCM,data:xYIMbvpVBBXdsHsrkbAjjcrMTftQFwJ0TAF/ALgwHOxTI7ik5Oc0nuMHdT0X9fEwllGrDx7sh3GnRbL5FR7v5gZUjEUK2RKGpDaWq4XFqOeMI6n5oKtcffhffQf4KVSEwXCdNvC6FCZgdvWVpBluMGM09R2XwXXTqDuFhI0jgZU=,iv:tSqqRktw0q6s9y1nf189xI3i7kr9qBzCBjv3LtEnOVk=,tag:hftC5SM8iQummSgbD/+u8Q==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.9.0" + } +} \ No newline at end of file diff --git a/homelab/stacks/zipline/zipline.secrets b/homelab/stacks/zipline/zipline.secrets new file mode 100644 index 00000000..4d7b465d --- /dev/null +++ b/homelab/stacks/zipline/zipline.secrets @@ -0,0 +1,58 @@ +{ + "data": "ENC[AES256_GCM,data:q7JN+gv+NSR+zVi2CO5Sw/fpG4qu+uX1A0X5m2lxmel3TvC+7Mwu/S8PsnpAkY4xThCUVhN5Y8B3CdmwzDtEbGtdJXd3X2yEQhl/Hkba3eNtRihCr0JdlLNnzD/sHe3H0vQFdjLw8ZABIWyjQfYrSY4RvOYw4QRbv2YBu48k55Mf6VCAIKL04Th5p9kB5ouArGsF,iv:A9YPJw+eYO5idzLo3TxqvzBNGmuDq0o6ZSgVZXy3chY=,tag:J2qqX+tNMFillHzrV1IF3g==,type:str]", + "sops": { + "shamir_threshold": 2, + "key_groups": [ + { + "hc_vault": null, + "age": [ + { + "recipient": "age1zswcq6t5wl8spr3g2wpxhxukjklngcav0vw8py0jnfkqd2jm2ypq53ga00", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBibmJIYXpIa3hxRWVWZlJQ\nc3VWd256NTVUQnVrM3JvdUduVWpsZVRJc0JNClI3cFdmUlVxNXhzcjlJUjI2OWxq\nOEhabVpST3FXbUdtVnJ0VVM1OVlBQTAKLS0tIGtXUStXUjhUQ3N1am9iOGVNbnNT\nSGtSQy9VV1YzS2lNTHk4c2l3aUM0bzQKxPz+7xbWDgSozjxAI77iaKGRoZ2GcQ4s\n5b09BAsZzTVYj6tvHZrVYaaa6nfPDGZLKI/n55XPbLpIbqO6bcbeoAM=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + }, + { + "hc_vault": null, + "age": [ + { + "recipient": "age1zswcq6t5wl8spr3g2wpxhxukjklngcav0vw8py0jnfkqd2jm2ypq53ga00", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBORDZOR1NwZmpxQUdHU05V\nRXNKSCtjQkpGMnZpcWppWmRuc3hmN29lYzBNClQ3ZVlOR1l4b2s3YUFsZVd3dTJT\neEcwUkMwY2JwWmRjZmErTVZyb0lSSlEKLS0tIDF4ckprTEZqOGoxeVkrdk1sbHkv\nSitHWFYvZUdtbVc5YnZRV1UyUW8zUFEKsiMoWXo3L830RSQ33YB1hgM9K+DgrtLD\nQHXcXn56eJ9/ZrXaFxTFXZgYV7w4XFGguFDi3grwGUzCq9O1oEjJFi0=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + }, + { + "hc_vault": null, + "age": [ + { + "recipient": "age193t908fjxl8ekl77p5xqnpj4xmw3y0khvyzlrw22hdzjduk6l53q05spq3", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0dGFVNnE5M0FzMWFST3Ev\nL3VvMm9qR2ZOVVRkWUNtc3pSRDVyUEdhT0RJClRxZ2twYnA0Q01JOE1YOWh5S3h5\na2pTVE4wSzlzZ1lpN3VnR0ljdWpyT0UKLS0tIHRLVVJXU1FEQ0JTZlFQZ0swampn\nVFF0QS9BcitlQVJyYjdVcHN0TU9Ib3cKk+YFPxVQwk6e3MwdIWXkZq+ufA/8SaO5\nMjF5PrDBw3dFYlVC7u4jJ/zPHvcfMKOipNxIHUjjk/Mha+mKTjJgWTA=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + }, + { + "hc_vault": null, + "age": [ + { + "recipient": "age13prhyye2jy3ysa6ltnjgkrqtxrxgs0035d86jyn4ltgk3wxtqgrqgav855", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaGdpQTZYZlNOVzhzSTZU\ndFY1d00vM1VXMGh1TE1sQ1FlRXpXSDJ3SEFjCmd6WU9YVnZReDYweVlLUmdEQ0NF\naUk4VGtUMkpYdkR3VDEwQ3cvUHYxWVEKLS0tIGp3eHg5ekQrVXJ6Qlh6czJIODZ2\nWkN0MCtXVmZER0toaEJTSHpsRnBXRzAKTmGCezNjZJhyHBj8cbLw8VymJ5t79CcW\npYD3Ckxo+gdgqkFljA8tWxKa0nCn/38xUsBAjAnkoSH/lJim/K4971E=\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1n20krynrj75jqfy2muvhrygvzd4ee8ngamljqavsrk033zwx0ses2tdtfe", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKdnFxM1dodGVvN2dxWG4w\nNk5xcDg2dU5tSE1CbnExSDEyNFlpdjRGKzBNCjF2cXZ0NlFMYXA5MHNibG9wdDVx\nNUloU3h3dmJLMk5zcTEvN3dab0o3czgKLS0tIDRyaFI4bVpKY0dIakFZR0lWK0U2\nb3hNZGFkd1pja2NmangvUVJxbnJ4SEUKGhrvAUKUr8+fMZWLWldIEJmkctbv/bZQ\nsrg1OJf8DHyjgknOKbCikkApFbtRPoK8R1+iikiqnnI2na8UwTpCEMw=\n-----END AGE ENCRYPTED FILE-----\n" + } + ] + } + ], + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": null, + "lastmodified": "2024-10-08T18:55:02Z", + "mac": "ENC[AES256_GCM,data:txE3pZA/PCJldSaNlQP04FsWhXBEWoww8O3cPJyU6Z+E7geqz6Xh1xBZD54BGXWrsVqbnYwgEf+jD9d+6HaMIgXDwBCFYYyEvGtZnichD5Z94BTn4jGkbf9RvLaBIenx+pesrpX6VloIxhXje6gjnRWebIsxPySowmT+J379o44=,iv:mQpZkNWtIOpwhk0EQAO+oSvIMfZw7NjSvIW+uAwDxlk=,tag:gevA1etCl9Ql7YENRU9HCQ==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.9.0" + } +} \ No newline at end of file