diff --git a/nix/apps/does-it-build/default.nix b/nix/apps/does-it-build/default.nix index a4dafa3..10815c4 100644 --- a/nix/apps/does-it-build/default.nix +++ b/nix/apps/does-it-build/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, my-projects-versions, ... }: +{ pkgs, lib, config, my-projects-versions, ... }: let does-it-build-base = (import (pkgs.fetchFromGitHub my-projects-versions.does-it-build.fetchFromGitHub)) { inherit pkgs; }; does-it-build = does-it-build-base.overrideAttrs (finalAttrs: previousAttrs: { @@ -7,6 +7,8 @@ let }); in { + age.secrets.does_it_build_private_key.file = ../../secrets/does_it_build_private_key.age; + services.caddy.virtualHosts = { "does-it-build.noratrieb.dev" = { logFormat = ""; @@ -36,7 +38,15 @@ in User = "does-it-build"; Group = "does-it-build"; ExecStart = "${lib.getExe' (does-it-build) "does-it-build" }"; - Environment = "DB_PATH=/var/lib/does-it-build/db.sqlite"; + Environment = [ + "DB_PATH=/var/lib/does-it-build/db.sqlite" + "GITHUB_SEND_PINGS=1" + "GITHUB_OWNER=Noratrieb" + "GITHUB_REPO=does-it-build-notifications" + "GITHUB_APP_ID=2263995" # https://github.com/settings/apps/does-it-build + ]; + # GITHUB_APP_PRIVATE_KEY=-----BEGIN RSA PRIVATE KEY-----... + EnvironmentFile = [ config.age.secrets.does_it_build_private_key.path ]; }; }; diff --git a/nix/my-projects.json b/nix/my-projects.json index 32a507d..fc8c335 100644 --- a/nix/my-projects.json +++ b/nix/my-projects.json @@ -18,12 +18,12 @@ } }, "does-it-build": { - "commit": "112420d22472087dba725cb1339cf5e6ff9af1f4", + "commit": "e4c69f17be6b7ae96d1845774250a1b11aef070f", "fetchFromGitHub": { "owner": "Noratrieb", "repo": "does-it-build", - "rev": "112420d22472087dba725cb1339cf5e6ff9af1f4", - "hash": "sha256-co23mxD+iOtDSRt9eGukr/VTiuggo3ioWLJo6nTPBXo=" + "rev": "e4c69f17be6b7ae96d1845774250a1b11aef070f", + "hash": "sha256-9voNfhTn614cDtit4W8FPWCXukqy7jUXLH0mHfzfxVE=" } }, "upload.files.noratrieb.dev": { diff --git a/nix/secrets/backup_s3_secret.age b/nix/secrets/backup_s3_secret.age index 5812754..1aba70f 100644 --- a/nix/secrets/backup_s3_secret.age +++ b/nix/secrets/backup_s3_secret.age @@ -1,15 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg Ubif+7f0FscvxH0oTp2XuE5UrnJRjZRRejwntbUAIS8 -4LxCnF+az26QSsq6v+Y6rH5zL7QeZPPkcCrcytfObEg --> ssh-ed25519 91VHug NWa7+XM6IDmIPSY8/pQN0fCuFmXxOtKs2EKplv3hSGo -Xbo6mFWgK44xtCaPiRFmAMfuZXbeBem3VkZWszv1MgY --> ssh-ed25519 XzACZQ fcyVXD8Vu9Ua9fWLhKr4fpgpPHfVd4Cs9YSDx3g10nM -XhaLkawrOyqL7LW48z/6pk2Wf58w54F7x86G/q0YCjM --> ssh-ed25519 51bcvA ADj0kZgsbgdDZbb94lLsqAtXoVlTRhT4D5Fdcwx5B3A -cq5CkwbW7xM0MpKeUR08lLB0ibUlVnbe/JquxA9zF3A --> ssh-ed25519 vT7ExA lsVqsf2sBlghJzwzgY4u596374Dm+xnlS8Oz+R08gyw -xU3Be/Fb2ebXHszb702Qri7vH7m/lWzcrtVYt5D1Fsg ---- MfpuGafRuE5es9Uk9PXjwaDQK8QSXV7p30QR4cIiCso -RUe+3KcqIDNWE츂x|LSȍq8jXz-2y%%׍ -؉vTKf/*9-Js0hD8P,K3 -NIdLGc d \ No newline at end of file +-> ssh-ed25519 qM6TYg Iwzv4FA1pIES6SynmQejkarTCRc3xwqJhbPK+U197BI +0F6drTGs14E6tf0/eDcWu2y9b9yYLXjkAkHV0hT01MQ +-> ssh-ed25519 91VHug NhInO02XlDKVDYeEk+Y4jmaAG03YO1yy50R9vnUGPWU +0lgqjusLVxCLIQA8BSQveTNKEQf7uyEctRX+TDqipj4 +-> ssh-ed25519 XzACZQ vtBUTFyr4gjqcUsn3WCYOPspjnVwL19izhKYGX4kiy4 +bW6zwWar6COr58s/U6GJZsOPicAECUJr2VQZ0nOneF0 +-> ssh-ed25519 51bcvA itN8U0WXocUWmsO7Hy3a94j+aUyH83BN4iG9RK/9lCk +Eyuawwp7+bv9/f2UOihOqFLcETsFgPS+iJRrLID6jT0 +-> ssh-ed25519 vT7ExA tJoU7e9muJvOLU1a50SI7+KgbHYke/vaMn77u9gAyTw +p0Ofeh74R/UTpaBRDITNjwwXkUs/grBnsHiSvzUxCKU +--- EsDITASaNlbxImI3s/hCMpOM6Up4UrZgez1fTJlRT1M +:,ߐ n.|*#Ca%Iw$` ssh-ed25519 qM6TYg aOAjlUp3G75gqvm+LVZhhAg45oJsobkyDTLY49b/zRU -pogMMIptbR/b1RKM3uJxEHT9WzSyZSHFQjAsNvcSAYU ---- t29inWsEHgMh0rx6BGbMBBvCy9wrhxqLmssWUBgZAxA -Izb"bD۩Pd@fŽveŗpk* e +-> ssh-ed25519 qM6TYg 8d5Jze4wRBsRqy+/ifnIMf5IhQZrn2Hs0k4/RCJoAko +IUgnzcCHmQhsrJfUuOG5s7nl98/X+ycpr0JWQeqc1Ps +--- dNJXPA7jEVJs5yQmvcaidVnJoN5pRMbh6okQsjjDabc +f ssh-ed25519 qM6TYg QhiVyWtk2dq2YqG+wQFWaZLFHQo05mBd92IKwxMjqhQ -nOLu8KsLxTOKBGggph/qy3Y1sTsHoWFajEQ3XFf2ktA ---- x9n+BLZcUdhVJ1nkUWcYL2IFztoiItD0tI5AfScS68U -sj١H'ǁZĿo@ݶtowZ/Z #bU0+e`X\ M"y+ :^քC@U+L \ No newline at end of file +-> ssh-ed25519 qM6TYg oDQzYAbe3UasUjgyw2AAtcYaID6nKD+j6C2R05R8Bw0 +NnPZ81p1PafEEfYHP+MafDdrhq83aJ2NuH8iYz2Uk/Q +--- FM0robN+6H2uAp+ASaCVxlLmD6xVp5oNHHAz1BE8/+A +6K(6F Ys#+\,\L:R@t糆Bp +.6> L}`QD 5Q-iӧF 1V \ No newline at end of file diff --git a/nix/secrets/garage_secrets.age b/nix/secrets/garage_secrets.age index 39b3bdd..96d1e66 100644 --- a/nix/secrets/garage_secrets.age +++ b/nix/secrets/garage_secrets.age @@ -1,14 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg 1WRiwfAjRtvM4SNe0Kb39CNjo3HbOTAyFtqxLCtbmxs -IvaCCjpo61RBYwcUz/QPNFmxZaD+F48LIs6ojdBqxok --> ssh-ed25519 91VHug 0FQFOLE2YZF5GGqcjaHap9t9z6xvyVkY3kzsUlU9cSI -j9hGw7d+UCkOaN4K/GGChDdQUsFDt0kw+bj/+QP6xiU --> ssh-ed25519 XzACZQ tGQdswquRCp+iXrYXHLlg64DC/lor2QvgiWY10Shkg4 -ejl3+e9EVGyS+oP3161B0VdfXup9RPeyWI8wHJliHEw --> ssh-ed25519 51bcvA La5y55eSktxwiIQaNOzEIh8QFTv7MvToPVNefwgpAFg -e+mKIU1sMXbQmZ2EUGEAAV4vdCIY24MM1/EGrNBn7+c --> ssh-ed25519 vT7ExA McL/w6ZheS2TkmfyrTsdbdtT03hsHuqMx6VwpMtHDF4 -uBvctWaqmECReOwyW7rT/OsEn9b8qaivo4n5RQ3Cabg ---- AITRERll2MxhVYGt8EIbYSOlEDfCTfRm2/jvgvvPbqY -(CopvjI5le\<َ>6x$i%.OxQyrŗ7 -[%2DYđNTp& &.FL?Z[O(P@xj[)F \ No newline at end of file +-> ssh-ed25519 qM6TYg XH2/5yvGH0VhjebJyPu5BeIGIdjkSEtB0thG+wl1SBM +BoUFXhZy5rW2c1Ye/TrGpvTVwfZl6H/Y2nY5mjAAEdE +-> ssh-ed25519 91VHug Q0FVWn3sWTNvppfGixQInkvduYqkkH+r+iKpeHsGRBI +pSGWT07iyalzWqHWnw+tcC/izIuikRr8fOgthTInJiA +-> ssh-ed25519 XzACZQ gQVu4gindib9vfdcnyWhBw4NlVcArGajU/8rbh0lJTg +CYeMNZWQujKXbItZZUddyb/Wa2qDFnTw1iDc/t/NcCQ +-> ssh-ed25519 51bcvA YdIeRH95KTXoXVfhBN4y/rm03rC+9hLoj+addsf29Wk +rW0zqtUxujI9SZg9Fpku/RbOv5FdMc0Hwg+G+ED0gVA +-> ssh-ed25519 vT7ExA dIb7uhBqj1wJOr96JmKNE9nbiEuHUQFVYuojnXFxMGg +h+B/zv0n4xqaJqyuBv8K2+aUfSZYNk38peN25m4ON/A +--- T34nvRv3+nOaYfSCAsfQEWVY4cFsO8qAnZIOks+Ay0w +<]u/q|]c^w2D)[e :dSK\?GCx ꂞ(^k#r>(byW݃UJOjF59gba27O >i㷱?ؔ]dy4:*]$B &U}Y7c䭸jr돜D \ No newline at end of file diff --git a/nix/secrets/generic_backup_password.age b/nix/secrets/generic_backup_password.age index c5f7aa6..1e72b6f 100644 Binary files a/nix/secrets/generic_backup_password.age and b/nix/secrets/generic_backup_password.age differ diff --git a/nix/secrets/grafana_admin_password.age b/nix/secrets/grafana_admin_password.age index 363d61c..18d4ced 100644 Binary files a/nix/secrets/grafana_admin_password.age and b/nix/secrets/grafana_admin_password.age differ diff --git a/nix/secrets/hugochat_db_password.age b/nix/secrets/hugochat_db_password.age index bde5cd8..07af726 100644 Binary files a/nix/secrets/hugochat_db_password.age and b/nix/secrets/hugochat_db_password.age differ diff --git a/nix/secrets/killua_env.age b/nix/secrets/killua_env.age index 1d8a07e..30a6d95 100644 Binary files a/nix/secrets/killua_env.age and b/nix/secrets/killua_env.age differ diff --git a/nix/secrets/loki_env.age b/nix/secrets/loki_env.age index 3fa1a61..2c2ee27 100644 Binary files a/nix/secrets/loki_env.age and b/nix/secrets/loki_env.age differ diff --git a/nix/secrets/minio_env_file.age b/nix/secrets/minio_env_file.age index 834b52a..b23894b 100644 --- a/nix/secrets/minio_env_file.age +++ b/nix/secrets/minio_env_file.age @@ -1,8 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg rrAASuKrjVYunxCZCyiGI94hiIcnj5tCZgtrNwDM6Dk -drt/hxV1oD6F9km2P6ODRl48o7Z5DzNxZzGp475gJdk --> ssh-ed25519 XzACZQ aC2p4JKStZyOBcAOxKMHm1CubsILvhLm0AADzYEPB1Q -rTIR+IXgD+65JmE+GNTmZUHYwjOasbHMyS8amWLr+6M ---- Lq0EHVDsbHi5jo6xHl8tu5lNmlm/4+gmQCXDzJ/RJ9c -A P #&h.$3hm/TߖilG٥\)&h ^HaQ;F>\ҬH%tF%ogxSaF|XwLgfټC -!' \ No newline at end of file +-> ssh-ed25519 qM6TYg LSDtwlm9BBqnpzsXoeCQnJ7YImkiMJvqfet0MROaBFA +h/efW4ApyMTnp/p+3tUa8RaMreI00/T5Q4Gh71lFeTk +-> ssh-ed25519 XzACZQ of8qdZPKfTtCKNMA+eHgX+WijYZHrHrzq0alH1mTJyE +rVW21YZw3kbe1TCQj/Ch1krrJt0o6PXThAV/eUbY8B8 +--- gWUT/+evFTR4ARdKZK01i8qgDCjt/EKnpKCAS5fCt1w +(H At_ï +5oJV.D̀#lGu#ɉK!-T~"ksҖoǣip1> +𗣫iD6yPOia$/]:dk]A3 \ No newline at end of file diff --git a/nix/secrets/openolat_db_password.age b/nix/secrets/openolat_db_password.age index 654f947..29aa8ee 100644 Binary files a/nix/secrets/openolat_db_password.age and b/nix/secrets/openolat_db_password.age differ diff --git a/nix/secrets/pyroscope_s3_secret.age b/nix/secrets/pyroscope_s3_secret.age index ad31ff9..58f14dc 100644 --- a/nix/secrets/pyroscope_s3_secret.age +++ b/nix/secrets/pyroscope_s3_secret.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ YLo7+3kHVq7SX2PY4FK7uo+M/Pxj4cM4bElze5zZoEk -tFpHzUFjUor+ispu1xc1Ak7LwOY03U3djpf/3vLO4cE ---- +JoRkMMYQsY1P9sBDe3ren9EzmxSgtBUWFZ+tXtSqks -..v@bv7Ui‚6$B-L2*ZL@0) 㟮h TyȘ*\gУ㜟EN M:D @hBEqgkV(+$]ӎ`n;@ |ZMF"bmqU`Di\vjjg^ .Z9YQ&% \ No newline at end of file +-> ssh-ed25519 XzACZQ m7q/k7PLJpNDFEFxm1SNobF2abWhncqxWri+CbVqkCc +3NB/uTmOdkPH3N+kZrSep7u0A57KpQzI4tlzyT6Z5rg +--- cI9WvpISFVi7fXb5pcNgyu3rH+4L8o5dZUnAxhQ1x4Y +Wj;lx8m Šq߮X+MJSzա4`=8$9`}w~ډשa6t۫Jtu"|p`Tb("j:I5PrSd3%[ok!gc\6sd52%j \ No newline at end of file diff --git a/nix/secrets/registry_htpasswd.age b/nix/secrets/registry_htpasswd.age index d52861c..a2098a6 100644 Binary files a/nix/secrets/registry_htpasswd.age and b/nix/secrets/registry_htpasswd.age differ diff --git a/nix/secrets/registry_s3_key_secret.age b/nix/secrets/registry_s3_key_secret.age index 4430ac3..11c6e78 100644 --- a/nix/secrets/registry_s3_key_secret.age +++ b/nix/secrets/registry_s3_key_secret.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg UBpc2V2VJetEhYozhkG+wsd54xEhrOrp7m66yc6ajj8 -/TUkD70joloXjbEtcXJv1s8ImrfPz+SMiWv43mmDM6M ---- 936RSpAyH4aqIfs4Ks6eWSYqqfBxL/ZfElzbyjHB+ww -pR##dUt伍:b떹XMl>`7zIkEIqU+C) |A6щ[d0f.#ZדLL(n} ffGp Poͯ=!}WMpİ{<.^ҏ}}?X8 ߕglR=e ]~5H \ No newline at end of file +-> ssh-ed25519 qM6TYg zUespYByALhutVeTKDYRCXpskuwotOzfTjWCVtGcXTg +LxTqOV8sk6zOQv1eAIvSfUoeCfpus5lB4VwQV7joMks +--- bCKKLMK0Alw89Sh6HB4EW76P29aNUC5btlNFHDBTsQk +4mXA/u U}hz <5f2<jYO=FWIW%%8f~` vl@:1ľkYwaL:\:G㚢H٭rkbEbt/N}v-xMXܿtGRptǭ.hbԓ8x5LF"qaG ssh-ed25519 LZU5Eg vEsVLUdg/m+EWIX6pdlKH3xPNRoEzQLG34SjUU3dP38 -OiTw/STEWVuZDmaSWuhUDjlty5NCXOYal9GrhitOgJA ---- acirsYbJtNaJGlfGf2Ukapl66fvaqQmaYcU0agfRjPg -Yy> -ZmNRVס,@q}{5zoep jز\wB&7 ) \ No newline at end of file +-> ssh-ed25519 LZU5Eg T16scfWokKj/4TaHvplWuIdHCs/oR4t3V9x4hFo9yhU +h8RoAXndXCwUBskJlJTLWoXapWMUTF0yPnqUV9u7qt8 +--- qGJTnOXdnz8D9eA8AKtYarVa1l75x10SqjhsKchfQ+E +aҿ/}=7_r^rԕ?y"oؘ;U`*(Ztz7s ,$^k` \ No newline at end of file diff --git a/nix/secrets/wg_private_dns2.age b/nix/secrets/wg_private_dns2.age index b712c12..cfca638 100644 --- a/nix/secrets/wg_private_dns2.age +++ b/nix/secrets/wg_private_dns2.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 5bWSnQ /bBbjFUC+P1zRm12PNyVJIzdqibX5e11GDXkzuCjqgI -CNvbZZO266X7m8pyw2Q+E+Jvv1ZNB1pOY/Sf4OeaODM ---- oWefUtd5pmgQzs7Wk+IYrsjQjjpS+1eYcxofRyQtPzs -kHehP[]:z<*d֍&k1Ac`R%x?T2'rt0P \ No newline at end of file +-> ssh-ed25519 5bWSnQ eiSLsSWrjQldff9ZbhjhrvGgNGWxmxKu1JfsWmjo0Qg +cCLcVTC9hzN79cOMOuuOMo5VpwlBKraqxqeQuvVzqqU +--- bgLRe7t+KD2ehc2gAp4RERJ3nN5pGLA04L06KHVeQvw +ns4!nt3ܻ:#i? Jʷ '1d!? $/{uX6erL.][ \ No newline at end of file diff --git a/nix/secrets/wg_private_vps1.age b/nix/secrets/wg_private_vps1.age index 69f3e29..ff02844 100644 Binary files a/nix/secrets/wg_private_vps1.age and b/nix/secrets/wg_private_vps1.age differ diff --git a/nix/secrets/wg_private_vps2.age b/nix/secrets/wg_private_vps2.age index a924ba5..aa84c78 100644 Binary files a/nix/secrets/wg_private_vps2.age and b/nix/secrets/wg_private_vps2.age differ diff --git a/nix/secrets/wg_private_vps3.age b/nix/secrets/wg_private_vps3.age index 341a7b2..a874cea 100644 --- a/nix/secrets/wg_private_vps3.age +++ b/nix/secrets/wg_private_vps3.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 XzACZQ //MVwFVmv8J0fNDH35jA/wRYWEwBpTNeuqb22JDlQ1M -WxQNXyyaOwR+jbLEd6qul81Tcy5ZmC9xQzXLdokrdBM ---- 4hvQvXwTU3vuYYkO1cud43LbDvFKfzSY+HB0nEfQbGA -HʹTԖ,2ڵG2tI| 4jxz 7) iNw,IN ҄wbpnF VA \ No newline at end of file +-> ssh-ed25519 XzACZQ EsFwUOjtcoWVd5gJxu0vAfcXxGZovBBKcGuin+TE6kY +51vzn9SvfX8WCDe8f5dtblAhFykUIxLkvsNK6XjMSuQ +--- VTYLeqYga9RKPLxjB6JotAMC4StSGh9PNNnG3+kq6vs +]#A *R1*{TMڍíq2~pGJ#RWrWC ҷ# 3^͗ \ No newline at end of file diff --git a/nix/secrets/wg_private_vps4.age b/nix/secrets/wg_private_vps4.age index cf963a0..81426e6 100644 --- a/nix/secrets/wg_private_vps4.age +++ b/nix/secrets/wg_private_vps4.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 51bcvA afHu7io35iOiA79ghD+kTKgaiLv7t4UDH3MY4vc57kE -ZW0xYUH9bqD3vFWvmWT0LMGdcbnqFHafdO0/EakU29k ---- oMTnoSLV3ZvjjEjIbJpFp37Twz7GbljLuhrPfyYzvVU -M9__:2b_%c ee>`uSJiQz\]$c[ӽVud4 \ No newline at end of file +-> ssh-ed25519 51bcvA 14yVvUnmbYRhz0jbTEsj5bEZnJleq6ZT3NgOqVybzFk +F0cCQQhghlR3rHDEiBwIWdBXv6Cfac+JL9MArEXOHuY +--- bB7RaiP/rNyTpjpoa2qXmZw7RCa73b2FEy2WN+CTpfk +M):8&=$8.U7~j]QHC$^"˿ +WCZ#uA!dXpx"1c \ No newline at end of file diff --git a/nix/secrets/wg_private_vps5.age b/nix/secrets/wg_private_vps5.age index 25eb7b6..6f2383b 100644 Binary files a/nix/secrets/wg_private_vps5.age and b/nix/secrets/wg_private_vps5.age differ diff --git a/nix/secrets/widetom_bot_token.age b/nix/secrets/widetom_bot_token.age index f65d2c0..1c91ca7 100644 --- a/nix/secrets/widetom_bot_token.age +++ b/nix/secrets/widetom_bot_token.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 qM6TYg oOHHqlwmPvW9l6F125mS5u7iJ2hznWVpZrVh9Gs9SkQ -M8Xbif6Ts+upr+ri6X8H6JviwYhZhZsL41eMNCOIJo4 ---- PXmESo/wbek0iXWltDKEUzQFt8ehaYinWqzlm2nTPvg -`TKshiiO AD.sY9ٍf~FDG^yש՝va{m-P?TT`(P A<0 \ No newline at end of file +-> ssh-ed25519 qM6TYg 47hyYUYzL2tHYd2ASQ9Ij87lqU3+Skcela0RcPK0iG0 +6r0oZsnmk4Zuk0QGqnmXcicMKlUMXvsJLzsqXmJCnZA +--- AQ8Yn+WuU1cSZ9UFeyG6xF6Jr8J8AhQ6FXJVA1MOPc0 +mj b3eYe6_Բl34Dsq41߭Z{G콺EQ޳539 a-,AGda0 \ No newline at end of file diff --git a/nix/secrets/widetom_config_toml.age b/nix/secrets/widetom_config_toml.age index f02bb7b..cf9ff8d 100644 Binary files a/nix/secrets/widetom_config_toml.age and b/nix/secrets/widetom_config_toml.age differ diff --git a/secrets-git-crypt/does_it_build_private_key b/secrets-git-crypt/does_it_build_private_key new file mode 100644 index 0000000..dca73aa Binary files /dev/null and b/secrets-git-crypt/does_it_build_private_key differ