Run automatic update #494

Merged
github-actions[bot] merged 3 commits from create-pull-request/patch into main 2024-08-08 16:05:21 +00:00
8 changed files with 51 additions and 132 deletions

View file

@ -19,7 +19,6 @@
./services/postgres.nix
./services/gitea.nix
./services/old-homepage.nix
./services/postfixadmin.nix
./services/dovecot.nix
./services/postfix.nix
./services/reverse-proxy.nix

View file

@ -32,7 +32,6 @@
database.createLocally = true;
redis.createLocally = true;
};
systemd.services.peertube.path = with pkgs; lib.mkForce [bashInteractive ffmpeg_5 nodejs-18_x openssl yarn python3 coreutils systemd];
services.caddy.virtualHosts."peertube.chir.rs" = {
useACMEHost = "chir.rs";
logFormat = pkgs.lib.mkForce "";

View file

@ -1,42 +0,0 @@
{
pkgs,
config,
lib,
...
}: {
services.postfixadmin = {
enable = true;
adminEmail = "lotte@chir.rs";
database = {
dbname = "postfix";
host = "localhost";
passwordFile = "/run/secrets/services/postfixadmin/dbpassword";
username = "postfixadmin";
};
hostName = "mail.chir.rs";
setupPasswordFile = "/run/secrets/services/postfixadmin/setupPassword";
extraConfig = ''
$CONF['encrypt'] = 'dovecot:ARGON2ID';
$CONF['dovecotpw'] = '${pkgs.dovecot}/bin/doveadm pw';
'';
};
sops.secrets."services/postfixadmin/dbpassword" = {
owner = "postfixadmin";
};
sops.secrets."services/postfixadmin/setupPassword" = {
owner = "postfixadmin";
};
services.postgresql.ensureDatabases = ["postfix"];
services.caddy.virtualHosts."mail.chir.rs" = {
useACMEHost = "chir.rs";
logFormat = pkgs.lib.mkForce "";
extraConfig = ''
import baseConfig
root * ${pkgs.postfixadmin}/public
php_fastcgi unix:${config.services.phpfpm.pools.postfixadmin.socket}
'';
};
services.phpfpm.pools.postfixadmin.settings."listen.group" = "acme"; # there is no nginx group
services.phpfpm.pools.postfixadmin.group = "dovecot";
}

View file

@ -201,17 +201,16 @@
},
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1721986491,
"narHash": "sha256-lVAlUOIPszv5HMYQGscskeGdRIYpTY6xrPfEok0hHgI=",
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"owner": "numtide",
"repo": "devshell",
"rev": "cc8700135fb0740199ac248063f20c6b1a3c7e42",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"type": "github"
},
"original": {
@ -327,11 +326,11 @@
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
@ -341,24 +340,6 @@
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": [
"systems"
@ -408,11 +389,11 @@
]
},
"locked": {
"lastModified": 1722067813,
"narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=",
"lastModified": 1722936497,
"narHash": "sha256-UBst8PkhY0kqTgdKiR8MtTBt4c1XmjJoOV11efjsC/o=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27",
"rev": "a6c743980e23f4cef6c2a377f9ffab506568413a",
"type": "github"
},
"original": {
@ -465,11 +446,11 @@
]
},
"locked": {
"lastModified": 1721563874,
"narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=",
"lastModified": 1722773431,
"narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028",
"rev": "04a4b4d84e02590715e753da3d35fb03cddc6425",
"type": "github"
},
"original": {
@ -551,11 +532,11 @@
"umu": "umu"
},
"locked": {
"lastModified": 1722043237,
"narHash": "sha256-Z7Z0OvshgHKr3CGHxgumwRR06YphjTXPf1mMsYsvESw=",
"lastModified": 1722734656,
"narHash": "sha256-3Fk8o9WR1oVroPx3hDhmLguzhaFz0OifsIpLXLbef/Q=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "dc966ed468b9112dfef5c9129a7d5c5e68a491c6",
"rev": "88aa6c5d59424d979741bc7fc817f02f5b200c08",
"type": "github"
},
"original": {
@ -566,11 +547,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1722017959,
"narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=",
"lastModified": 1722332872,
"narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf",
"rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
"type": "github"
},
"original": {
@ -651,11 +632,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1722102829,
"narHash": "sha256-U8IKw1m4/QKrQf6TFse5TQQUPQ3ERmi2nq8Dg8C+wnM=",
"lastModified": 1722967064,
"narHash": "sha256-cQDo0aGuz2JSUo5Pc8JvFa905nTRHrSEce+lij6S8jw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3d3c0f4d34f218e1a30f280dfa635cfe4e8111b1",
"rev": "eec16b48aa9e98c64b4fdd4a564092ea03a9c8a8",
"type": "github"
},
"original": {
@ -671,11 +652,11 @@
]
},
"locked": {
"lastModified": 1721303961,
"narHash": "sha256-YbK6n1lH12TSqWZA3raENpZxz1bPs4rh0AMiIKxTQnE=",
"lastModified": 1722523018,
"narHash": "sha256-Lt2s7uz+Mcjav8kC+fLmhVeFtbAV2vp8jhWXiRQv0mU=",
"owner": "DarkKirb",
"repo": "riscv-overlay",
"rev": "3fd3313983d984ec4d0b303ba1ad34d2ddc2b3bb",
"rev": "75d5cd0d0c51268f46f1e1da6803d2fe661733bb",
"type": "github"
},
"original": {
@ -697,7 +678,7 @@
"dns": "dns",
"flake-compat": "flake-compat_4",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"gomod2nix": "gomod2nix",
"home-manager": "home-manager",
"hydra": "hydra",
@ -711,7 +692,7 @@
"riscv-overlay": "riscv-overlay",
"rust-overlay": "rust-overlay",
"sops-nix": "sops-nix",
"systems": "systems_2"
"systems": "systems"
}
},
"rust-overlay": {
@ -721,11 +702,11 @@
]
},
"locked": {
"lastModified": 1722046723,
"narHash": "sha256-G7/gHz8ORRvHd1/RIURrdcswKRPe9K0FsIYR4v5jSWo=",
"lastModified": 1722910815,
"narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "56baac5e6b2743d4730e664ea64f6d8a2aad0fbb",
"rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",
"type": "github"
},
"original": {
@ -744,11 +725,11 @@
]
},
"locked": {
"lastModified": 1721688883,
"narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
"lastModified": 1722897572,
"narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
"rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
"type": "github"
},
"original": {
@ -772,21 +753,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"umu": {
"inputs": {
"nixpkgs": [
@ -796,11 +762,11 @@
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1721455769,
"narHash": "sha256-u95jjeLWk1S65fxIP+Y0iFR0WYVYwfg+PZNr6ZECiS8=",
"lastModified": 1722710858,
"narHash": "sha256-PzMKVcp5ffL4v8+ukuTZRp78DI3kmjUBJUo0Vz5OYC4=",
"ref": "refs/heads/main",
"rev": "abbdeed18f1dc6b51a636e544e697a88d21a0ad5",
"revCount": 678,
"rev": "babc7214d9bc5007eb6c0d59a720dea59fa694ac",
"revCount": 696,
"submodules": true,
"type": "git",
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"

View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/RPGHacker/asar",
"rev": "5edd93ce9de723d3bfc21dc41a921f5ec33b71da",
"date": "2024-04-08T10:14:54+02:00",
"path": "/nix/store/k2dd8chrcd2556gj1ppflawwr40a5lrk-asar",
"sha256": "1s7jhnsmb27cw5f0869h8171fk7b1bndpj9axrc6zlyka4njph9d",
"hash": "sha256-LcErLVHT029Y7irJ2+wK60wXTkAwGQRc4eyIVbWF8ug=",
"rev": "5e0cdba7566438be20abf4591633c01d83750dd9",
"date": "2024-07-31T13:41:45+03:00",
"path": "/nix/store/kyppnzkir53l8y10w0qwqvl2azqndfzj-asar",
"sha256": "09qjl6jx39j4578vfcwfjgv8v7v71bs7f0zabdzmjdyfj8gdj767",
"hash": "sha256-xxzZHpLON1l/W+oDd/QKZ5+N9pOOM7fRKUSm0aWhEic=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -1,10 +1,10 @@
{
"url": "https://github.com/turt2live/matrix-media-repo",
"rev": "6e516cf62d439347b69abe998ba1806e3ec5894e",
"date": "2024-07-15T16:03:48-06:00",
"path": "/nix/store/4568dqjdgybamnyxylws10xwxpl0cxa8-matrix-media-repo",
"sha256": "05qnf5zlg22ndd5cbrdl4b90694nm8dvk8b4161yjhzdhnpp153f",
"hash": "sha256-bpRwr4XtQ+mDCWShuRuqliQD0iK05cVKa1aIR39xFhc=",
"rev": "85fabea54375630e4f404ff6ecc8c63fbaa28cdc",
"date": "2024-07-30T15:15:28-06:00",
"path": "/nix/store/cfkry06c1jdv9sg0bwakjd1x35s6cwkr-matrix-media-repo",
"sha256": "1vqwn6mpjy6gl21kgwvy1swfxkx6m9gmyl1a815s5wgxr7w6gddn",
"hash": "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

View file

@ -14,10 +14,10 @@
in
buildPythonPackage rec {
pname = "plover_lapwing_aio";
version = "1.1.19";
version = "1.1.20";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-T4YnO34/CdcNByrYF+klvOF6Hp8iBmNdJ9zaACbKYyg=";
sha256 = "sha256-7IQgbUerHdn+O8WPpR9w5lEXcewJm/zIqcJbXStePmQ=";
};
postPatch = ''

View file

@ -28,9 +28,6 @@ services:
gitea_token: ENC[AES256_GCM,data:NkEXwLbofK2QnWrUuxY5QvUkYPWzY7Brsgl9FvV5Me0J5mWuHUc0Dg==,iv:UhA4JUKV/+D5lOTAx3fC+rsr61lYQJRioSyKQ3s1e0Y=,tag:E/HB2S90o7dLmeWBLsOP9w==,type:str]
gitea: ENC[AES256_GCM,data:J614G1lGr+XLRDrXoQtMHDFKrweRHWX5cvB6h4mOV63lRJEKB8c3/w==,iv:+no/ER8Ef5vsdBBT/evfguTwj3nc6aFFcOS16USEqgQ=,tag:LjNY9bRPCu5qM4ngowAlmA==,type:str]
old-homepage: ENC[AES256_GCM,data:MYpqkUkk6y+OhaZu2VsmWocGIsTqxZN1fCk6viNYJSAdGTikK+XtBMj8KrWSwA/8wfcWth20goLvOwQuCJiSxdl86sdsUbc18/NqK52B6LS6h+Pw3GNsyAQUu+oaxfL7FtHRvViiSS8LVulKeSjL7osUPlrJVqEZfqOX4bNkPxiamOvZko1uHC+iWGY68BnAHQoEbdVNhNEUQqm2A8/vidNU4Z9VrmPXmr8nr/c+Ut+aF0iPZJGqSoxWS8+zFU6ubv/W2rA18wi8hOYPpV0=,iv:U245wbKo9e4AAGS6khhEV9lDB6y0ukAUtLMnihHC9T0=,tag:xqvUnSHuI7XeRkk4NtZZyQ==,type:str]
postfixadmin:
dbpassword: ENC[AES256_GCM,data:/gpfZxD2zcEUBr2VTgtkvSBSDw==,iv:HZ5Yra+T4Z0nviBwfCnVmjPorFcoGp2Z2SSrG6BzIvo=,tag:fbNw1AQ2zJWJocumT/Zjbg==,type:str]
setupPassword: ENC[AES256_GCM,data:ohZ7kwFrUUjL7lav5ZkBo2y8xMKDAaBi04tVvg2u/b8geBag8kaP/Oa2ujUN6vXY3k/BnbgQU/MsbZg8,iv:PONBqrSl3PHcKztfbqYLB38xQCHlD+qbUOpbSnXFwFk=,tag:4cMj0wHAJRCAYICobXOY1Q==,type:str]
dovecot:
rspamd_password: ENC[AES256_GCM,data:E19GJ7zE3FMFVAd7P7rvcmxRMYs=,iv:Nn6VdFq0UIs3Oh9JUKyiDvnk1rkNeqLIhjFSxdOPtmU=,tag:oGE3Ht/d0jlheMKunhwEsQ==,type:str]
dovecot-sql.conf.ext: ENC[AES256_GCM,data:1Uhyz+X9zDgBuO/CHnr4Ms+fK5gzNfjXb+LShLmtk087Pdr2F4CYZR4Bs3ZRlfEj6KRUx21grlLQ4zCbF6R/iA7I6ujvvpjicAd3/TCnxRBOvQif2kAiNjkLBIG4yaI6JMlQMPbH/EPFdnSE1lrNXi5duULzE66IdW0vEMG7ZJR3IXpJY162X75jNt1ufCTOMxe6f6wzuw+LlE4sbIvSU88HclST2ukIq/sUPTfalplKNFFJeBrfmiN+3KsxcFfqxvtuIazm8+4+fE6jPPtOdkBIcKjumDgof8KYgZqHIJDHyU0Tt3X8c+moAgCGf4gZtfeMmpy/l3Q9vvGzKMo/Tg/FWPW/+WnvsbO7TBv0P7qDKjGROdNXCKbHtdJ7jxIjZzk6hdWhN+sZqz9/m005CT52tEAGoY+MkQhzrKwrKkjItvU99YRGj9O1d7P256vpYOwAzgbz1HHPmmEjG/yLX/Fy9GSZfPOGu3j1kJtL/vfZh35jx3jx+bud8gAaDjke5XqKKE4M3mme8S31D3nmSC1vmRHSknGg4jg61dZ+awOgafWnB4Sxu0NHtw3f1EEcrmLW0H/G7pldMIbzextowlx+PlqvQU4s45EQLpSAB+lIYFrsGA/EofrILqA+R64bIsy0AqNxxsnnya9j60LL+vngCpY+3njsRn5u1yFobU5Tcdk2i0bjPYy8Ea8LFyXpDjRGtOKMLYwdDQ4qZG7Sg1bK7bkbbN213y1EApwwNKBo2ujAGbIOXsO/SveBfX6+z/CrvEiZWDib0IFbUN0PxRy2gnp2EsEMcD1KK2cS5t31fgTsGitSRL4rTV3I0bPDP/bBbzjlDQUFqm9OVN5tFsiJbxy+zFEBWGnReZkPk08jmL20Cu2SMDN0cvszDdJs5jndX9Rfahw=,iv:TMvVt1zakr5NupbYwszn+fB+Tckrfj/UHfZOI2lSKDc=,tag:8bVDCjAlQk9hQQalLhHWhw==,type:str]
@ -87,8 +84,8 @@ sops:
M0tUV1E2dndCTXRsOVJBU2ZNVHRFS2MKhBezoPFc0mdXassxViUfsmFTQCVbP1Js
bEpByfdW69GUCjR0HmcjF3NX/Cd5N5uivy+yLp3IrincHAz8LBIXyw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-06-25T06:52:54Z"
mac: ENC[AES256_GCM,data:FhxxJOAZNyaAOIj3cEiFnNgLZzc4AmY2N0lI338zqy3rStYvJACu7aGXRtuUjZnij7MyZmvPgBk+wPRvyiup44FJp/aPuUuVK8nOLkoLPvZH+8gZqS4NxOCaJcKXFKgJVVfbKa417oEwRN8jbb6ocIq/RYhycKECTFiGw7eLrM4=,iv:LJUJH01z16yyrm7u/dvpgKo4g7vmYVFNKDD9aSjLz4g=,tag:DkPXQgRiisL6EwUUD3ArMw==,type:str]
lastmodified: "2024-08-03T09:43:57Z"
mac: ENC[AES256_GCM,data:UepGWInhglReBZdUV1gu64JWLl9LQ1vFfSFmcUJIzll+tBIYy6A4Hf0vSS25cFxdufwOvAV3AAaQgtXbfrSw46AIGPwbbwyLABD1SbO+X6VrtApVIPbS7C+c/jqyxjFGCzNrADEZ6OMRyds23Yik55wmz0wYil94Jx/11IXk/lw=,iv:hmeVbzTmHxhN0c13vS+/ZKxkvbnVxaez62I/D4Y/BEg=,tag:B+0ng3yS7qS95U/crsVzQA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.1
version: 3.9.0