diff --git a/newinfra/nix/apps/upload-files/default.nix b/newinfra/nix/apps/upload-files/default.nix deleted file mode 100644 index aa108b5..0000000 --- a/newinfra/nix/apps/upload-files/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ upload-files, pkgs, lib, config, ... }: { - age.secrets.upload_files_s3_secret.file = ../../secrets/upload_files_s3_secret.age; - - systemd.services.upload-files = { - description = "upload.files.noratrieb.dev file uploader for files.noratrieb.dev"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = { - UPLOAD_FILES_NORATRIEB_DEV_BUCKET = "files.noratrieb.dev"; - UPLOAD_FILES_NORATRIEB_DEV_ENDPOINT = "http://localhost:3900"; - UPLOAD_FILES_NORATRIEB_DEV_REGION = "garage"; - }; - serviceConfig = { - DynamicUser = true; - ExecStart = "${lib.getExe (upload-files {inherit pkgs;})}"; - EnvironmentFile = [ config.age.secrets.upload_files_s3_secret.path ]; - }; - }; -} diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 6410db8..87357ef 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -20,7 +20,6 @@ pretense = import (fetchTarball "https://github.com/Noratrieb/pretense/archive/${my-projects-versions.pretense}.tar.gz"); quotdd = import (fetchTarball "https://github.com/Noratrieb/quotdd/archive/${my-projects-versions.quotdd}.tar.gz"); does-it-build = import (fetchTarball "https://github.com/Noratrieb/does-it-build/archive/${my-projects-versions.does-it-build}.tar.gz"); - upload-files = import (fetchTarball "https://github.com/Noratrieb/upload.files.noratrieb.dev/archive/${my-projects-versions."upload.files.noratrieb.dev"}.tar.gz"); inherit my-projects-versions; @@ -184,7 +183,6 @@ ./apps/killua ./apps/forgejo ./apps/openolat - ./apps/upload-files ]; deployment.tags = [ "caddy" "eu" "apps" "website" ]; diff --git a/newinfra/nix/modules/caddy/base.Caddyfile b/newinfra/nix/modules/caddy/base.Caddyfile index 69a626b..825ee15 100644 --- a/newinfra/nix/modules/caddy/base.Caddyfile +++ b/newinfra/nix/modules/caddy/base.Caddyfile @@ -21,32 +21,6 @@ } } -# https://gist.github.com/ryanburnette/d13575c9ced201e73f8169d3a793c1a3 -(cors) { - @cors_preflight{args[0]} method OPTIONS - @cors{args[0]} header Origin {args[0]} - - handle @cors_preflight{args[0]} { - header { - Access-Control-Allow-Origin "{args[0]}" - Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS" - Access-Control-Allow-Credentials "false" - Access-Control-Allow-Headers "${args[1]}" - Access-Control-Max-Age "86400" - defer - } - respond "" 204 - } - - handle @cors{args[0]} { - header { - Access-Control-Allow-Origin "{args[0]}" - Access-Control-Expose-Headers * - defer - } - } -} - http:// { log respond "This is an HTTPS-only server, silly you. Go to https:// instead." 418 diff --git a/newinfra/nix/modules/caddy/default.nix b/newinfra/nix/modules/caddy/default.nix index 07fd744..bbcb15a 100644 --- a/newinfra/nix/modules/caddy/default.nix +++ b/newinfra/nix/modules/caddy/default.nix @@ -70,13 +70,6 @@ in precompressed zstd gzip br } } - - files.noratrieb.dev { - log - encode zstd gzip - - reverse_proxy * localhost:3902 - } '' else "" } diff --git a/newinfra/nix/modules/caddy/vps1.Caddyfile b/newinfra/nix/modules/caddy/vps1.Caddyfile index b595537..e337003 100644 --- a/newinfra/nix/modules/caddy/vps1.Caddyfile +++ b/newinfra/nix/modules/caddy/vps1.Caddyfile @@ -1,3 +1,29 @@ +# https://gist.github.com/ryanburnette/d13575c9ced201e73f8169d3a793c1a3 +(cors) { + @cors_preflight{args[0]} method OPTIONS + @cors{args[0]} header Origin {args[0]} + + handle @cors_preflight{args[0]} { + header { + Access-Control-Allow-Origin "{args[0]}" + Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS" + Access-Control-Allow-Credentials "false" + Access-Control-Allow-Headers "${args[1]}" + Access-Control-Max-Age "86400" + defer + } + respond "" 204 + } + + handle @cors{args[0]} { + header { + Access-Control-Allow-Origin "{args[0]}" + Access-Control-Expose-Headers * + defer + } + } +} + www.noratrieb.dev { log redir https://noratrieb.dev{uri} permanent @@ -52,14 +78,6 @@ olat.noratrieb.dev:8088 { reverse_proxy * localhost:5011 } -upload.files.noratrieb.dev { - log - encode zstd gzip - # we need HTTP/2 here because the server doesn't work with HTTP/1.1 - # because it will send early 401 responses during the upload without consuming the body - reverse_proxy * h2c://localhost:3050 -} - ################################################################ # redirects diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index 9a4da25..8ff312e 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -57,11 +57,6 @@ let # --- website stuff blog = vps1; www = vps1; - files = combine [ vps1 vps3 vps4 ] // { - subdomains = { - upload = vps1; - }; - }; # --- legacy crap old-docker = vps2; diff --git a/newinfra/nix/modules/garage/README.md b/newinfra/nix/modules/garage/README.md index c16f1d1..f788a5f 100644 --- a/newinfra/nix/modules/garage/README.md +++ b/newinfra/nix/modules/garage/README.md @@ -25,8 +25,6 @@ - key `backups` RW - `forgejo` - key `forgejo` RW -- `files.noratrieb.dev` - - key `upload-files` RW ## keys diff --git a/newinfra/nix/my-projects.json b/newinfra/nix/my-projects.json index ff195a2..b709b0a 100644 --- a/newinfra/nix/my-projects.json +++ b/newinfra/nix/my-projects.json @@ -4,6 +4,5 @@ "slides": "0401f35c22b124b69447655f0c537badae9e223c", "pretense": "270b01fc1118dfd713c1c41530d1a7d98f04527d", "quotdd": "e922229e1d9e055be35dabd112bafc87a0686548", - "does-it-build": "81790825173d87f89656f66f12a123bc99e2f6f1", - "upload.files.noratrieb.dev": "90f6a6a82fb24c61fd19643d383ea7c8415f558a" + "does-it-build": "81790825173d87f89656f66f12a123bc99e2f6f1" } diff --git a/newinfra/nix/secrets/backup_s3_secret.age b/newinfra/nix/secrets/backup_s3_secret.age index 6e4b2ae..9298136 100644 Binary files a/newinfra/nix/secrets/backup_s3_secret.age and b/newinfra/nix/secrets/backup_s3_secret.age differ diff --git a/newinfra/nix/secrets/caddy_s3_key_secret.age b/newinfra/nix/secrets/caddy_s3_key_secret.age index a0e5c46..6b75178 100644 Binary files a/newinfra/nix/secrets/caddy_s3_key_secret.age and b/newinfra/nix/secrets/caddy_s3_key_secret.age differ diff --git a/newinfra/nix/secrets/docker_registry_password.age b/newinfra/nix/secrets/docker_registry_password.age index 3d42d33..bc89cad 100644 --- a/newinfra/nix/secrets/docker_registry_password.age +++ b/newinfra/nix/secrets/docker_registry_password.age @@ -1,5 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg QziuzHQxmWyRdv8dUPBWTgnMxFtqR6ttP16Z3XdvD3Y -Krxmha5J+gTU0DjzPDTDIwz1mW0Q84XR2FgQyPm4bf4 ---- t4Mea1Y35o5t2dhREnp8Zq1AyR4DAWMFW7Vv3CkgGKw -lTS+Ƴ6yrOn&c`ϰ :7V-tfpuwIw \ No newline at end of file +-> ssh-ed25519 qM6TYg +BQUq++K4fbTXFQXdZwoVKaeRY75C96A1vnn5gUo5WY +jxUb+nX0t0OIhJxgdaOwTvviVnGoPlAKcmXIRW7FhEM +--- plPYamLI4c2gzNcPkNeEdh68k3i3STrazb5sTG7txUY + GAv°( +\9N +wJ`Y.x.lq 93 \ No newline at end of file diff --git a/newinfra/nix/secrets/forgejo_s3_key_secret.age b/newinfra/nix/secrets/forgejo_s3_key_secret.age index 6bfaa64..93ae17a 100644 Binary files a/newinfra/nix/secrets/forgejo_s3_key_secret.age and b/newinfra/nix/secrets/forgejo_s3_key_secret.age differ diff --git a/newinfra/nix/secrets/garage_secrets.age b/newinfra/nix/secrets/garage_secrets.age index 57eb61b..25936cc 100644 --- a/newinfra/nix/secrets/garage_secrets.age +++ b/newinfra/nix/secrets/garage_secrets.age @@ -1,12 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg B17o68OCsoljQLd4yLx1gZbt9zsFhQE8/QJeZ3Gx+AI -ADxN8iqNN5ApzHMtIXMnMTN4qe/7ba+ZoqkpHDpq9dE --> ssh-ed25519 XzACZQ Jp5WvbUVmfecvN95vM6+DQmJicVf4u94Vm0mYtBVODw -XAdVpk6bAwAU7OQxvedepr3g8HQo5sY5efy3lYhf1xA --> ssh-ed25519 51bcvA DUkgjLS805iAsnaCl3B8BOP6cdKOJCx0aK23UEDmTyw -dUZhXJiYkCZvassxSg0Cgf9c+ta2Oc2PNhLdvHBP24M --> ssh-ed25519 vT7ExA 0Z2/GFY2aqO2HJJet3CRSh3yxchGt7AYTzkl0D2aoEQ -GuMqW7tbsEl/SskgN1hPa0B/aWtet/+pHxmbwsTzPCM ---- vgf72fLRkTVRtJoxh+qfim9YYELE0W74L6ZVjpo+8vI -=&C#/nܤ29o[S+ uWʶ4f/hA#Os_RVEVAlT/VtJNU;nGQݣO{x[#PH9P:z -yX`]%>+~)`Vx۰i-F$xH)TMcZ \ No newline at end of file +-> ssh-ed25519 qM6TYg dSNo/WHtuVibuLghfNnznYw6+zsMJOWvi7LitHSn3AY +pfZti2of1OZVOgVR+wXZrhGggtZ2W3jyUADDWVxQHfs +-> ssh-ed25519 XzACZQ d5+ZaKmyb1yTZJ0mvPYl6On9XaOp8Z59zNQXVtEj6F8 ++Ku4GwagVLPZHzOpkaFPZ1i5NoB9Z+Eyd0tuY28yS5Y +-> ssh-ed25519 51bcvA PxNLpJLMnUrlyzKUairI6Y+f6BYn7N9e/OURoiHcWQk +FsXdpP0pM+Xvst93kHIG+KsDlwrRRks4jxl+Q487Msc +-> ssh-ed25519 vT7ExA PE9zzE4bKcexXg6LuoQnUOJbvNlqQF//qm1fgB6sM0M +YSzgtZ+zGoTljLHrxeIY7MQV7xmLNDPFEeVrSq37QHA +--- VGV6MkGwLwYmCq73bDzIJaRRTESJ9a1fieP1AJNiAUs +j\_I9dUK F1^ouJo + P"ltֱv%anEZX2שS; J$~jcg\~5$ք* ]" ٠jS+qΗ@w編˚N1F@k$_a…;Z |XLKh0 6"<ّ \ No newline at end of file diff --git a/newinfra/nix/secrets/grafana_admin_password.age b/newinfra/nix/secrets/grafana_admin_password.age index aa33f26..41f0ce1 100644 Binary files a/newinfra/nix/secrets/grafana_admin_password.age and b/newinfra/nix/secrets/grafana_admin_password.age differ diff --git a/newinfra/nix/secrets/hugochat_db_password.age b/newinfra/nix/secrets/hugochat_db_password.age index 1c4ea95..4107bb3 100644 Binary files a/newinfra/nix/secrets/hugochat_db_password.age and b/newinfra/nix/secrets/hugochat_db_password.age differ diff --git a/newinfra/nix/secrets/killua_env.age b/newinfra/nix/secrets/killua_env.age index 54a0777..a687f62 100644 Binary files a/newinfra/nix/secrets/killua_env.age and b/newinfra/nix/secrets/killua_env.age differ diff --git a/newinfra/nix/secrets/loki_env.age b/newinfra/nix/secrets/loki_env.age index f071802..2906c38 100644 Binary files a/newinfra/nix/secrets/loki_env.age and b/newinfra/nix/secrets/loki_env.age differ diff --git a/newinfra/nix/secrets/minio_env_file.age b/newinfra/nix/secrets/minio_env_file.age index bf78046..654e4c3 100644 Binary files a/newinfra/nix/secrets/minio_env_file.age and b/newinfra/nix/secrets/minio_env_file.age differ diff --git a/newinfra/nix/secrets/openolat_db_password.age b/newinfra/nix/secrets/openolat_db_password.age index a9e307c..3aad0a6 100644 Binary files a/newinfra/nix/secrets/openolat_db_password.age and b/newinfra/nix/secrets/openolat_db_password.age differ diff --git a/newinfra/nix/secrets/registry_htpasswd.age b/newinfra/nix/secrets/registry_htpasswd.age index 738862b..15f74b3 100644 Binary files a/newinfra/nix/secrets/registry_htpasswd.age and b/newinfra/nix/secrets/registry_htpasswd.age differ diff --git a/newinfra/nix/secrets/registry_s3_key_secret.age b/newinfra/nix/secrets/registry_s3_key_secret.age index 3b6cb41..91288e1 100644 Binary files a/newinfra/nix/secrets/registry_s3_key_secret.age and b/newinfra/nix/secrets/registry_s3_key_secret.age differ diff --git a/newinfra/nix/secrets/s3_mc_admin_client.age b/newinfra/nix/secrets/s3_mc_admin_client.age index 719f1ed..f8b93d8 100644 Binary files a/newinfra/nix/secrets/s3_mc_admin_client.age and b/newinfra/nix/secrets/s3_mc_admin_client.age differ diff --git a/newinfra/nix/secrets/secrets.nix b/newinfra/nix/secrets/secrets.nix index 1d3b484..dbc1da9 100644 --- a/newinfra/nix/secrets/secrets.nix +++ b/newinfra/nix/secrets/secrets.nix @@ -23,7 +23,6 @@ in "s3_mc_admin_client.age".publicKeys = [ vps1 vps3 vps4 vps5 ]; "killua_env.age".publicKeys = [ vps1 ]; "forgejo_s3_key_secret.age".publicKeys = [ vps1 ]; - "upload_files_s3_secret.age".publicKeys = [ vps1 ]; "wg_private_dns1.age".publicKeys = [ dns1 ]; "wg_private_dns2.age".publicKeys = [ dns2 ]; "wg_private_vps1.age".publicKeys = [ vps1 ]; diff --git a/newinfra/nix/secrets/upload_files_s3_secret.age b/newinfra/nix/secrets/upload_files_s3_secret.age deleted file mode 100644 index a556152..0000000 Binary files a/newinfra/nix/secrets/upload_files_s3_secret.age and /dev/null differ diff --git a/newinfra/nix/secrets/wg_private_dns1.age b/newinfra/nix/secrets/wg_private_dns1.age index 0f4a0d0..39f0f71 100644 Binary files a/newinfra/nix/secrets/wg_private_dns1.age and b/newinfra/nix/secrets/wg_private_dns1.age differ diff --git a/newinfra/nix/secrets/wg_private_dns2.age b/newinfra/nix/secrets/wg_private_dns2.age index 8495f12..3657409 100644 Binary files a/newinfra/nix/secrets/wg_private_dns2.age and b/newinfra/nix/secrets/wg_private_dns2.age differ diff --git a/newinfra/nix/secrets/wg_private_vps1.age b/newinfra/nix/secrets/wg_private_vps1.age index c4e3f87..3e7321e 100644 --- a/newinfra/nix/secrets/wg_private_vps1.age +++ b/newinfra/nix/secrets/wg_private_vps1.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg 4aRY2+KMkGoSJtRfdkTRwIj6bYGSQJvJjq669297MHE -Kjf7jo93e4oMRKmN5u3Xa3CUpIp9bZPoUAGqjdgOulw ---- wapYiQbpT4gfZyI5cMnB4O+LdM9PvsUxM7nTv954nNg -eVn?]Ł3!l0ر<[o[?B'W( \ No newline at end of file +-> ssh-ed25519 qM6TYg vC8XBZQGff/q/SEsiIb+pyhfE/2MCWbo1m+suXpzyhY +r2R02FSzrpiPyoAeiPqWNdXc0Jqd6v2rv4hxo89LqD8 +--- NBCfTZYGNmAHQOABVhlcsgbJmKpmeUM15FdKLQjVazw +,t} | &-^uU6Z_&ue[w _벢 +^\(gPy-j;D \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps3.age b/newinfra/nix/secrets/wg_private_vps3.age index 0e7dec1..ddb65ce 100644 --- a/newinfra/nix/secrets/wg_private_vps3.age +++ b/newinfra/nix/secrets/wg_private_vps3.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ J67LUjHa64q/z1K8zZpx1rsnoQ94NzhkeXEpfNr4ZVQ -dy5Tre9IicxhLBHoqvQAZepG7bNg2dEXFT5iPRcWOcA ---- 9dJKhJeue6VNi0Sw05BX/t8jsxXyRIKz0K3/sy0kT7w -h9isM =TnwW)㲛\<2*%_ܳgLN5cD5@ͻ \ No newline at end of file +-> ssh-ed25519 XzACZQ FnGfRDdT9kQXeYzv7yzwI+1fVXmeseC6YVCCzeoeLCQ +HydL6WRBzLmqAKNmf0kzBmZiFRQ8KM3dHEdx2676Nx0 +--- E7+8BYiNPPm3fI6FiEii2txlbsesfSXuE2Nxvb7Zlx4 +m5q~>R-e~+$T5PrnH:$4jkB$CqRuMmF`A4e \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps4.age b/newinfra/nix/secrets/wg_private_vps4.age index 414c14b..15bf0d4 100644 --- a/newinfra/nix/secrets/wg_private_vps4.age +++ b/newinfra/nix/secrets/wg_private_vps4.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA P7ouUh98Mfi9Jsu6MDWaWH0NB2alXRIK8hxBIs0Nylg -tUZ1sWLlvPizsSWhK3fnVVhr4C9Ign5rwowxePGXFII ---- PHPizXT8GPP9mIFg1paqqc8w3qsX63XpLkeT0APybik -B?*8-nLsj< k*.@6KUg '8 #h.l~S3%!VYKlR ؘo \ No newline at end of file +-> ssh-ed25519 51bcvA IVcXj0PQpO6Rj7ovi4GgoQF77sRDdumHNavSVdQXcHI +O7j/05HqbjLvIYh9cT/iT8p6GMDn14vDOqU3Jh6tUIc +--- wt0viOUTFWu9ze3CcQ4i1xMrb+RLTOg2hcVsDwbzMzA +i-_rˣ*=@|D3e%nȭY'Rh3V%-=W; icS \ No newline at end of file diff --git a/newinfra/nix/secrets/wg_private_vps5.age b/newinfra/nix/secrets/wg_private_vps5.age index f677cad..b38a13d 100644 --- a/newinfra/nix/secrets/wg_private_vps5.age +++ b/newinfra/nix/secrets/wg_private_vps5.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 vT7ExA 9+j3VYkFAW1obbLc31nv+45SyPMqH1zZPkI+PU4lVH8 -G9QkkyTNH499EWhjiXCyXt7HgHlzJTZsaLiR+yOF18E ---- vq7bT3yTioJ1UsD7hSu5jyYKhOE6UMIMsosu4f5pK1w -QV#(7EY\Z?G٫_C I gNiVe]tx@w+ \ No newline at end of file +-> ssh-ed25519 vT7ExA kxCR8CbPH5GgSS/ENXQ81zPQ+n041l7yV6zzQv1smwk +mhn18RlBXbpMfZAHrUam5ktlV5Z28UIg8Ufk4H/tfSA +--- WXmrUK2YnQQqZQgoW219LEVgBoHa+N3NqO4cqsF9Pr8 +>0:h`;D + +쎽*TYD 9/9:LwQNCx'QHdcMϣ8 \ No newline at end of file diff --git a/newinfra/nix/secrets/widetom_bot_token.age b/newinfra/nix/secrets/widetom_bot_token.age index 105c8e5..a114651 100644 Binary files a/newinfra/nix/secrets/widetom_bot_token.age and b/newinfra/nix/secrets/widetom_bot_token.age differ diff --git a/newinfra/nix/secrets/widetom_config_toml.age b/newinfra/nix/secrets/widetom_config_toml.age index 13998d2..27f4f5d 100644 Binary files a/newinfra/nix/secrets/widetom_config_toml.age and b/newinfra/nix/secrets/widetom_config_toml.age differ diff --git a/newinfra/secrets-git-crypt/upload_files_s3_secret b/newinfra/secrets-git-crypt/upload_files_s3_secret deleted file mode 100644 index cd16464..0000000 Binary files a/newinfra/secrets-git-crypt/upload_files_s3_secret and /dev/null differ