Compare commits

...

10 Commits

Author SHA1 Message Date
Astrobot 0f4b9b0ed3 flake.lock: Update
Flake lock file updates:

• Updated input 'nixos':
    'github:SuperSandro2000/nixpkgs/ab1e460a6368f27a5c79264a3f39f4d1155805de' (2024-04-14)
  → 'github:SuperSandro2000/nixpkgs/85faabf6055e0923d03cab08d1681c53630bd319' (2024-04-15)
• Updated input 'nixos-unstable':
    'github:SuperSandro2000/nixpkgs/8fe0c9a40a136f69c0b4e2291ae4777cb304f2fc' (2024-04-14)
  → 'github:SuperSandro2000/nixpkgs/e5392ea597b3dbd5cc1ccb93943b033fa6363b0c' (2024-04-15)
• Updated input 'zentralwerk':
    'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=7a83be4be9636e3b027110821a8ca7f21754c257' (2024-04-15)
  → 'git+https://gitea.c3d2.de/zentralwerk/network.git?ref=refs/heads/master&rev=0ae5e86f08deed3a67bb2f6a65f65d6961bdef2c' (2024-04-15)
2024-04-16 10:01:03 +02:00
Sandro - 43ab6bb588
mediawiki: ignore files generated on updates 2024-04-16 00:23:09 +02:00
Sandro - 1bb0a86b01
server10: add luks key 2024-04-16 00:22:59 +02:00
Sandro - a3c0ae7d5c
Format 2024-04-15 23:35:32 +02:00
Sandro - 489e173b1b
Fix scrape secrets 2024-04-15 23:35:31 +02:00
Sandro - c87a967b12
mediawiki: update, set $wgNamespacesWithSubpages 2024-04-15 23:09:09 +02:00
Sandro - daf15aa5be
Remove secrets repo
Finally
2024-04-15 21:39:21 +02:00
Sandro - 852a3150b2
flake.lock: Update
Flake lock file updates:

• Updated input 'tigger':
    'github:SuperSandro2000/tigger/280de19a71ff0d35faf4b4dba04c13fcd601e6e9' (2024-04-15)
  → 'github:astro/tigger/073cc63fcd6e25cba775b0b4ad8056c6200da03f' (2024-04-15)
2024-04-15 19:06:55 +02:00
Sandro - c1b4d23878 Drop Tigger fork 2024-04-15 17:56:06 +02:00
Sandro - a2433d80eb
Disable nixos container 2024-04-15 16:26:00 +02:00
11 changed files with 345 additions and 142 deletions

View File

@ -372,6 +372,13 @@ creation_rules:
- *radiobert
- *polygon-snowflake
- path_regex: hosts/scrape/secrets\.yaml$
key_groups:
- pgp: *admins
age:
- *scrape
- *polygon-snowflake
- path_regex: hosts/server8/secrets\.yaml$
key_groups:
- pgp: *admins

View File

@ -16,6 +16,7 @@
];
boot = {
enableContainers = false; # should be enabled explicitly
loader.systemd-boot = {
configurationLimit = lib.mkDefault 10;
editor = false;

View File

@ -225,11 +225,11 @@
]
},
"locked": {
"lastModified": 1713152224,
"narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=",
"lastModified": 1713204594,
"narHash": "sha256-5yyHYBWFZUKXkJvOccPBeX83hH2iED54NLnWs2eWgS0=",
"owner": "nix-community",
"repo": "disko",
"rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e",
"rev": "d51114dc1bf3cfaba2b6644aabd16ff0c9909af5",
"type": "github"
},
"original": {
@ -395,11 +395,11 @@
},
"nixos": {
"locked": {
"lastModified": 1713134837,
"narHash": "sha256-meKOkIOoHKzzYr5FRfbWdthoo0EGIk/V/mi1g4mlYiA=",
"lastModified": 1713216111,
"narHash": "sha256-GQTrFOqX22COAT32/QaTCzHneNQtoY791JF82VPQcqI=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "ab1e460a6368f27a5c79264a3f39f4d1155805de",
"rev": "85faabf6055e0923d03cab08d1681c53630bd319",
"type": "github"
},
"original": {
@ -449,11 +449,11 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1713134245,
"narHash": "sha256-WH9peo1rrPiycF3NrJs+6HdVsDsJDqTQMDog/8UDjro=",
"lastModified": 1713215947,
"narHash": "sha256-exPzJK3EEpIrlKO6aglUtCLxm/vjz/p1H9GLRwTuKYc=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "8fe0c9a40a136f69c0b4e2291ae4777cb304f2fc",
"rev": "e5392ea597b3dbd5cc1ccb93943b033fa6363b0c",
"type": "github"
},
"original": {
@ -543,7 +543,6 @@
"openwrt-imagebuilder": "openwrt-imagebuilder",
"rust-overlay": "rust-overlay",
"scrapers": "scrapers",
"secrets": "secrets",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"skyflake": "skyflake",
"sops-nix": "sops-nix",
@ -600,11 +599,11 @@
"scrapers": {
"flake": false,
"locked": {
"lastModified": 1693949006,
"narHash": "sha256-ofwDlj+hBXlIH2rrMYjqaJD/OBqpxFAb7hay2BOIHGI=",
"lastModified": 1713211784,
"narHash": "sha256-WeTVBaVN9UZvw7dy8jkH0Vz8zWhcEqFlwqK9R+VYa0k=",
"ref": "refs/heads/master",
"rev": "d93045ab74f1a9fbd2a360fd24ca624c7cc2c62f",
"revCount": 70,
"rev": "4bdef3adf8ca8beefc2ebf6a838bb351bf8ca113",
"revCount": 71,
"type": "git",
"url": "https://gitea.c3d2.de/astro/scrapers.git"
},
@ -613,21 +612,6 @@
"url": "https://gitea.c3d2.de/astro/scrapers.git"
}
},
"secrets": {
"locked": {
"lastModified": 1713190267,
"narHash": "sha256-JuK9t9ax6iNJka99MuEHBigggURtuOldIuO3wRIqrJI=",
"ref": "refs/heads/master",
"rev": "3ebb2eed7868e62215a5d620ca903286850a8229",
"revCount": 167,
"type": "git",
"url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git"
}
},
"simple-nixos-mailserver": {
"inputs": {
"blobs": "blobs",
@ -638,11 +622,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1713083209,
"narHash": "sha256-edorCQeLfuUVGrtqp0HGJcTNzSJjOXvMFEdhrDZ9M/c=",
"lastModified": 1713201759,
"narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=",
"owner": "SuperSandro2000",
"repo": "nixos-mailserver",
"rev": "ed4320aaebe7550b89a5d17ae8f0979f0111f57d",
"rev": "4bc5bc9bdd0dd5816f24f286415f29e77a10b6e5",
"type": "gitlab"
},
"original": {
@ -825,16 +809,15 @@
"tigger": {
"flake": false,
"locked": {
"lastModified": 1713190077,
"lastModified": 1713196297,
"narHash": "sha256-xgEtm7r6AS8UetLWtAKm1Zy9N0Cm4MP9SPjNyksRv6Q=",
"owner": "SuperSandro2000",
"owner": "astro",
"repo": "tigger",
"rev": "280de19a71ff0d35faf4b4dba04c13fcd601e6e9",
"rev": "073cc63fcd6e25cba775b0b4ad8056c6200da03f",
"type": "github"
},
"original": {
"owner": "SuperSandro2000",
"ref": "password-file",
"owner": "astro",
"repo": "tigger",
"type": "github"
}
@ -916,11 +899,11 @@
]
},
"locked": {
"lastModified": 1713123078,
"narHash": "sha256-SM74YoSMCbVKEA/LSD/D/VYEa1eTV9EVxfjFt3KJk0o=",
"lastModified": 1713216489,
"narHash": "sha256-0owRmwL6LN620q30fLLyqFARWvR53P+uXoaqGqPK8qQ=",
"ref": "refs/heads/master",
"rev": "753cd1d5f37c5a420fb188f53bdaf8c2b8f43191",
"revCount": 1982,
"rev": "0ae5e86f08deed3a67bb2f6a65f65d6961bdef2c",
"revCount": 1984,
"type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
},

View File

@ -165,8 +165,6 @@
fenix.follows = "fenix";
};
};
# deprecated
secrets.url = "git+ssh://gitea@gitea.c3d2.de/c3d2-admins/secrets.git";
simple-nixos-mailserver = {
# url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
url = "gitlab:SuperSandro2000/nixos-mailserver/quote-ldap-password";
@ -195,9 +193,7 @@
};
};
tigger = {
# url = "github:astro/tigger";
# https://github.com/astro/tigger/pull/45
url = "github:SuperSandro2000/tigger/password-file";
url = "github:astro/tigger";
flake = false;
};
tracer = {
@ -223,7 +219,7 @@
};
};
outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, simple-nixos-mailserver, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, simple-nixos-mailserver, scrapers, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
let
inherit (nixos) lib;
@ -632,9 +628,6 @@
./hosts/scrape
{
_module.args = { inherit scrapers; };
# TODO: migrate to sops
nixpkgs.overlays = [ secrets.overlays.scrape ];
}
];
};

View File

@ -146,9 +146,9 @@
zone = [
{
domain = "c3d2.";
acl = "zone_xfr";
catalog-role = "generate";
domain = "c3d2.";
notify = [ "ns1.supersandro.de" ];
storage = "/var/lib/knot/catalog";
}

3
hosts/mediawiki/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/composer.json
/extensions/
/vendor/

View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "60ffc07d9341dde6660500dc6a37e136",
"content-hash": "5099ffea88a39a3baa0fd5ed0e86a158",
"packages": [
{
"name": "composer/installers",
@ -2202,12 +2202,12 @@
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
"reference": "d457b5c93e5001fbf4b5726d21038266e029e3be"
"reference": "ce0adade8b97561656ace07cdaac4751c271ea8c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/d457b5c93e5001fbf4b5726d21038266e029e3be",
"reference": "d457b5c93e5001fbf4b5726d21038266e029e3be",
"url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c",
"reference": "ce0adade8b97561656ace07cdaac4751c271ea8c",
"shasum": ""
},
"require": {
@ -2220,9 +2220,9 @@
},
"type": "library",
"autoload": {
"psr-0": {
"": "src/"
}
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"include-path": [
@ -2243,7 +2243,7 @@
"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
"source": "https://github.com/pear/pear-core-minimal"
},
"time": "2024-03-09T19:38:40+00:00"
"time": "2024-03-16T18:41:45+00:00"
},
{
"name": "pear/pear_exception",
@ -4191,16 +4191,16 @@
},
{
"name": "wikimedia/parsoid",
"version": "v0.17.1",
"version": "v0.17.4",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/mediawiki-services-parsoid.git",
"reference": "7cdb5b92ca3c8543821090c966ca991be0e15eb0"
"reference": "c71a351096de1710797a851d8e3e1c2e0c6d2b45"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wikimedia/mediawiki-services-parsoid/zipball/7cdb5b92ca3c8543821090c966ca991be0e15eb0",
"reference": "7cdb5b92ca3c8543821090c966ca991be0e15eb0",
"url": "https://api.github.com/repos/wikimedia/mediawiki-services-parsoid/zipball/c71a351096de1710797a851d8e3e1c2e0c6d2b45",
"reference": "c71a351096de1710797a851d8e3e1c2e0c6d2b45",
"shasum": ""
},
"require": {
@ -4268,10 +4268,10 @@
],
"support": {
"irc": "irc://irc.libera.chat/mediawiki-parsoid",
"source": "https://github.com/wikimedia/mediawiki-services-parsoid/tree/v0.17.1",
"source": "https://github.com/wikimedia/mediawiki-services-parsoid/tree/v0.17.4",
"wiki": "https://www.mediawiki.org/wiki/Parsoid"
},
"time": "2023-10-02T21:34:08+00:00"
"time": "2024-03-27T20:27:29+00:00"
},
{
"name": "wikimedia/php-session-serializer",
@ -5245,16 +5245,16 @@
"packages-dev": [
{
"name": "composer/pcre",
"version": "3.1.2",
"version": "3.1.3",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
"reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace"
"reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace",
"reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace",
"url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
"reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
"shasum": ""
},
"require": {
@ -5296,7 +5296,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
"source": "https://github.com/composer/pcre/tree/3.1.2"
"source": "https://github.com/composer/pcre/tree/3.1.3"
},
"funding": [
{
@ -5312,7 +5312,7 @@
"type": "tidelift"
}
],
"time": "2024-03-07T15:38:35+00:00"
"time": "2024-03-19T10:26:25+00:00"
},
{
"name": "composer/spdx-licenses",
@ -5396,16 +5396,16 @@
},
{
"name": "composer/xdebug-handler",
"version": "3.0.3",
"version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "ced299686f41dce890debac69273b47ffe98a40c"
"reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
"reference": "ced299686f41dce890debac69273b47ffe98a40c",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
"reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
"shasum": ""
},
"require": {
@ -5416,7 +5416,7 @@
"require-dev": {
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-strict-rules": "^1.1",
"symfony/phpunit-bridge": "^6.0"
"phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
},
"type": "library",
"autoload": {
@ -5440,9 +5440,9 @@
"performance"
],
"support": {
"irc": "irc://irc.freenode.org/composer",
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
"source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
"source": "https://github.com/composer/xdebug-handler/tree/3.0.4"
},
"funding": [
{
@ -5458,7 +5458,7 @@
"type": "tidelift"
}
],
"time": "2022-02-25T21:32:43+00:00"
"time": "2024-03-26T18:29:49+00:00"
},
{
"name": "doctrine/cache",
@ -6466,21 +6466,21 @@
},
{
"name": "nikic/php-parser",
"version": "v4.18.0",
"version": "v4.19.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
"reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
"reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
"reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
"php": ">=7.0"
"php": ">=7.1"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
@ -6516,9 +6516,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
},
"time": "2023-12-10T21:03:43+00:00"
"time": "2024-03-17T08:10:35+00:00"
},
{
"name": "phan/phan",
@ -6930,28 +6930,35 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "5.3.0",
"version": "5.4.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
"reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
"reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
"reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
"shasum": ""
},
"require": {
"doctrine/deprecations": "^1.1",
"ext-filter": "*",
"php": "^7.2 || ^8.0",
"php": "^7.4 || ^8.0",
"phpdocumentor/reflection-common": "^2.2",
"phpdocumentor/type-resolver": "^1.3",
"phpdocumentor/type-resolver": "^1.7",
"phpstan/phpdoc-parser": "^1.7",
"webmozart/assert": "^1.9.1"
},
"require-dev": {
"mockery/mockery": "~1.3.2",
"psalm/phar": "^4.8"
"mockery/mockery": "~1.3.5",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-mockery": "^1.1",
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^9.5",
"vimeo/psalm": "^5.13"
},
"type": "library",
"extra": {
@ -6975,15 +6982,15 @@
},
{
"name": "Jaap van Otterdijk",
"email": "account@ijaap.nl"
"email": "opensource@ijaap.nl"
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"support": {
"issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
"source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
"source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0"
},
"time": "2021-10-19T17:43:47+00:00"
"time": "2024-04-09T21:13:58+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@ -7045,16 +7052,16 @@
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.26.0",
"version": "1.28.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
"reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
"reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"shasum": ""
},
"require": {
@ -7086,9 +7093,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
},
"time": "2024-02-23T16:05:55+00:00"
"time": "2024-04-03T18:51:33+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -8508,16 +8515,16 @@
},
{
"name": "sebastian/resource-operations",
"version": "3.0.3",
"version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
"reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
"reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
"reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
"url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
"reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
"shasum": ""
},
"require": {
@ -8529,7 +8536,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
"dev-main": "3.0-dev"
}
},
"autoload": {
@ -8550,8 +8557,7 @@
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"support": {
"issues": "https://github.com/sebastianbergmann/resource-operations/issues",
"source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
"source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
},
"funding": [
{
@ -8559,8 +8565,7 @@
"type": "github"
}
],
"abandoned": true,
"time": "2020-09-28T06:45:17+00:00"
"time": "2024-03-14T16:00:52+00:00"
},
{
"name": "sebastian/type",
@ -8744,16 +8749,16 @@
},
{
"name": "symfony/console",
"version": "v6.4.4",
"version": "v6.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "0d9e4eb5ad413075624378f474c4167ea202de78"
"reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78",
"reference": "0d9e4eb5ad413075624378f474c4167ea202de78",
"url": "https://api.github.com/repos/symfony/console/zipball/a2708a5da5c87d1d0d52937bdeac625df659e11f",
"reference": "a2708a5da5c87d1d0d52937bdeac625df659e11f",
"shasum": ""
},
"require": {
@ -8818,7 +8823,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v6.4.4"
"source": "https://github.com/symfony/console/tree/v6.4.6"
},
"funding": [
{
@ -8834,7 +8839,7 @@
"type": "tidelift"
}
],
"time": "2024-02-22T20:27:10+00:00"
"time": "2024-03-29T19:07:53+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
@ -8997,16 +9002,16 @@
},
{
"name": "symfony/service-contracts",
"version": "v3.4.1",
"version": "v3.4.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
"reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
"reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
"reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
"shasum": ""
},
"require": {
@ -9059,7 +9064,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
"source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
},
"funding": [
{
@ -9075,7 +9080,7 @@
"type": "tidelift"
}
],
"time": "2023-12-26T14:02:43+00:00"
"time": "2023-12-19T21:51:00+00:00"
},
{
"name": "symfony/string",
@ -9165,16 +9170,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v6.4.4",
"version": "v6.4.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "b439823f04c98b84d4366c79507e9da6230944b1"
"reference": "95bd2706a97fb875185b51ecaa6112ec184233d4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1",
"reference": "b439823f04c98b84d4366c79507e9da6230944b1",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/95bd2706a97fb875185b51ecaa6112ec184233d4",
"reference": "95bd2706a97fb875185b51ecaa6112ec184233d4",
"shasum": ""
},
"require": {
@ -9230,7 +9235,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v6.4.4"
"source": "https://github.com/symfony/var-dumper/tree/v6.4.6"
},
"funding": [
{
@ -9246,7 +9251,7 @@
"type": "tidelift"
}
],
"time": "2024-02-15T11:23:52+00:00"
"time": "2024-03-19T11:56:30+00:00"
},
{
"name": "theseer/tokenizer",

View File

@ -78,6 +78,11 @@ in
src = pkgs.applyPatches {
inherit (pkgs.mediawiki) src;
# update by running the following commands
# nix build .#nixosConfigurations.mediawiki.pkgs.mediawiki
# cp result/share/mediawiki/composer.json .
# composer update
# and updating the vendorHash by trying to deploy once
postPatch = ''
cp ${./composer.local.json} composer.local.json
cp ${./composer.lock} composer.lock
@ -85,7 +90,7 @@ in
};
composerNoPlugins = false;
vendorHash = "sha256-oa39DG55dD7cRED0MWFHJCg+HF8lhf4mJw8/vS7J9gI=";
vendorHash = "sha256-Ki+rTFWxlWRl5pfeTdVeirgKOFGzXsZ9LQ1QZ0nenhU=";
postInstall = ''
mv $out/share/{php/mediawiki-pre-full,mediawiki}/
@ -131,12 +136,14 @@ in
$wgGroupPermissions['user']['edit'] = true;
$wgGroupPermissions['sysop']['userrights'] = true;
$wgNamespacesWithSubpages[NS_MAIN] = true;
define("NS_INTERN", 100);
define("NS_INTERN_TALK", 101);
$wgExtraNamespaces[NS_INTERN] = "Intern";
$wgExtraNamespaces[NS_INTERN_TALK] = "Intern_Diskussion";
$wgNamespacesWithSubpages[NS_INTERN] = true;
$wgNamespacesWithSubpages[NS_INTERN_TALK] = true;
$wgGroupPermissions['intern']['move'] = true;
$wgGroupPermissions['intern']['move-subpages'] = true;
$wgGroupPermissions['intern']['move-rootuserpages'] = true; // can move root userpages
@ -151,7 +158,6 @@ in
$wgGroupPermissions['intern']['minoredit'] = true;
$wgGroupPermissions['intern']['purge'] = true; // can use ?action=purge without clicking "ok"
$wgGroupPermissions['intern']['sendemail'] = true;
$wgNamespacePermissionLockdown[NS_INTERN]['*'] = array('intern');
$wgNamespacePermissionLockdown[NS_INTERN_TALK]['*'] = array('intern');
@ -159,6 +165,8 @@ in
define("NS_I4R_TALK", 103);
$wgExtraNamespaces[NS_I4R] = "IT4Refugees";
$wgExtraNamespaces[NS_I4R_TALK] = "IT4Refugees_Diskussion";
$wgNamespacesWithSubpages[NS_I4R] = true;
$wgNamespacesWithSubpages[NS_I4R_TALK] = true;
$wgGroupPermissions['i4r']['move'] = true;
$wgGroupPermissions['i4r']['move-subpages'] = true;
$wgGroupPermissions['i4r']['move-rootuserpages'] = true; // can move root userpages

View File

@ -1,4 +1,4 @@
{ pkgs, config, scrapers, ... }:
{ lib, config, pkgs, scrapers, ... }:
let
freifunkNodes = {
@ -37,14 +37,29 @@ in {
};
};
sops = {
defaultSopsFile = ./secrets.yaml;
secrets = {
"scrape/matemat/user".owner = config.users.users.scrape.name;
"scrape/matemat/password".owner = config.users.users.scrape.name;
"scrape/xeri/user".owner = config.users.users.scrape.name;
"scrape/xeri/password".owner = config.users.users.scrape.name;
};
};
systemd.services = let
serviceConfig = {
User = config.users.users.scrape.name;
Group = config.users.users.scrape.group;
};
scraperPkgs = import scrapers { inherit pkgs; };
makeService = { script, host ? "", user ? "", password ? "" }: {
script = "${scraperPkgs."${script}"}/bin/${script} ${host} ${user} ${password}";
makeService = {
script,
host ? "",
userFile ? "",
passwordFile ? ""
}: {
script = "${lib.getExe scraperPkgs."${script}"} ${host} ${lib.optionalString (userFile != "") ''"$(cat ${userFile})"''} ${lib.optionalString (passwordFile != "") ''"$(cat ${passwordFile})"''}";
inherit serviceConfig;
};
makeNodeScraper = nodeId: {
@ -67,7 +82,8 @@ in {
scrape-xeri = makeService {
script = "xerox";
host = "xeri.hq.c3d2.de";
inherit (pkgs.scrape-xeri-login) user password;
userFile = config.sops.secrets."scrape/xeri/user".path;
passwordFile = config.sops.secrets."scrape/xeri/password".path;
};
scrape-roxi = makeService {
script = "xerox";
@ -76,7 +92,8 @@ in {
scrape-matemat = makeService {
script = "matemat";
host = "matemat.hq.c3d2.de";
inherit (pkgs.scrape-matemat-login) user password;
userFile = config.sops.secrets."scrape/matemat/user".path;
passwordFile = config.sops.secrets."scrape/matemat/password".path;
};
scrape-impfee = makeService {
script = "impfee";

185
hosts/scrape/secrets.yaml Normal file
View File

@ -0,0 +1,185 @@
scrape:
matemat:
user: ENC[AES256_GCM,data:ApTjMg==,iv:GW5r7RKp7bFCKCSz0svezWOovOvSVil2QcDVRZum3n8=,tag:ZELz/h1lpSWJnkxk3hrzrA==,type:str]
password: ENC[AES256_GCM,data:mWp0GQ==,iv:74Kt126u85Mup/hgRXP0txXWpwdL8bsljm437CAQVEI=,tag:BB5qx9XRKLXBO4rBiDsAFg==,type:str]
xeri:
user: ENC[AES256_GCM,data:S8wqkzQ=,iv:X7q4MZd6YvtGOmSSyIk46zJNqUNWMnqlZN5U28+6sAg=,tag:VyQxKFuGvF855/e0dQiPgg==,type:str]
password: ENC[AES256_GCM,data:0CByy8YUzg==,iv:egZ7zNVkgU7S3qlp2TSzWWJgNIYxMavRmYrChsiLfW8=,tag:tMzGmy4QtDkZLXlyuwjlzA==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1p60rg45qrzpv2hcfzxl8d8k9afkk7dtrhr98cngeyuhlega83ynssmtx5k
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiSU1uaDhuV0dXV1h5R0pC
SDNtd2hLNDdPT29yTUV0cXJLWmMwKzV6VERzCnpIYmtXOGZjK0dUWnkwNTRrNmZX
SmVJekx3QTNZeHBYRVZRRmFIRlFRRTAKLS0tIGNjM0RVWHB3NGVEd2FIWk83cmwr
R21DUzZqdmx0NVFyUUxncHhFbHFGS0UKfXEJ8xRIgxl6tIYCHdX7lLZrkeMajM9e
ZBRZ3O+MEDoggFFuX+BG9Vgzqnx/VZLqKfV1lPdRTw4MO6FJa3b7Cw==
-----END AGE ENCRYPTED FILE-----
- recipient: age12aukzah0pt2rck52hwn08kezyxueqz2f49ld7hpyuzmu847vavdqkunn5c
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnTGZhVEpDU1NVd3VaVWk4
WW9XZHA4WktSZ2c5VEZCL0t0amp3MVRBb25rCkpEc25iekVtUkpCNUluQ051aE1k
b0FYbHAxZE9CS0FHNmxTNGFNcnlJMEEKLS0tIEQxWDFvNCtvRlJtUm8wZkkzU0VJ
TENFenF2aXkzdGNIN3RMS2wrVElZTEkKsGGldAOhRoVpCHqwRb3I2HwimFYRKWT0
YeBqNT5Dy27i5BDuPZwXtMrtcHri6Tm6VPhqDO+nZJN9NPZZYm1Kjw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-15T21:12:51Z"
mac: ENC[AES256_GCM,data:YMuDMci1dROUd6Jt7fS6kQVUQL1bsE86Fl9SlCxGWGLhkYMBfWBMSdPU32P6bnalGv/R7MRmMagfKBLbOYNsOSssIqBQVkvdHL+SgO480ffrwlLFJBtxxe55xbtG9wtVGisUT57/YO2/EOB7/SMie3GFgaCw2LZ9vvG+rHm2a2U=,iv:gk0d/6c08Fc4BdWZ3uMsGjt60CpZTFwf7YiL7+KNS2s=,tag:wXNax0sDjFI8MdI+o+QmQA==,type:str]
pgp:
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQIMA7zUOKwzpAE7ARAAg52rUu9zqY5bp0jU7QMjNfmrrioIC76HdYrFfcHrvFWa
at8F6RS0HjHrqboe25anQHIqs5rR2hmHFbok91238FLE34JDziDxsTzg8y9ZFaAJ
3fDLJUxtpmqA+pPTp+agiMArSwjBj9zaGwkaZB/RUFxh2AsGuAae1aoH4jrhrczb
PhXaUtA8iTWtPxVG+vnWAHYaW1ETmdi40jMInmxJFYW33tokQQY8QZmMd4yqVLXy
tXv74cw4EFp+G4YV+LZ/PA3naq9UdjO5e1la4Xo5PQt5B7tOhphpCrhLxBQ5Oklq
QT8XprZZBUrHj9eu4XrG/0OldwhruSXtYc+uLJjSytw2omqq6iqkQ4h6BmToCMdu
p+LSNc0s2RCLZtK/j1Q2RRXcsdplzT4vA3n7mb02xYqxyDKtNqDPNjDY3INwgNVj
DRldSCv7NSuKyDanRLOoVQwO7YnhpyMB7jSnNtHqzlGokQXiQiNFy6Jhm+yT2c7R
BZHXG2QxM1Yo0uvsksIgFmlz+3vbPhjU2HiOMu1yF37AT8iEqSRfdhjJ3Rp8PejN
ZWquOqm4WVbSbkzLvcYzfNXyHROwniqi1ej2t66E6kSwMn0WGxDiCuJpMwxvjXNY
BqjTA5psnMGKOsOEBUNfuDbFRZeUK0LMEq0NNmr5d57bXdUB7tyGjz7XiD/48wvS
XgEk4ykHUoQQbVCXibQaK4YBxFWFbwPVmUccAuqm04PiQxM+zNw+j7gIasC4p7a4
XkMrEMQlR+GbfA8FX9TpHfRDSRNKfGPd9JS4F4J7rRGc5TfLrXnza3qJ+VWIrp0=
=Ah7a
-----END PGP MESSAGE-----
fp: DD0998E6CDF294537FC604F991FA5E5BF9AA901C
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQIMA6j84+xkv3y7AQ//aSAxvtWOX3F3DpefehuwM1fzdjbWC2KBuTFof5iLBuCQ
AFMZ7eyRw1pc1Pztgf3e5C8T8hioiTZqSycwBCWg5onaYTh60pBU/HpyJ9t/9f+q
A7xXlG3YWG1Dg8iLmmIMIzSXmELl5fnibpr+FJ4h7xLaDU5NoER3FOFGB4UdLpbM
olgekLPvrrRdvntdrDAMtTIOqLiHiTLg5WF37jasLaSfIBaGDJFeNQS4XGjAsujU
XjNzFFdsswzY09AeK5Bea4jt5vubuF02mIwaUG/oNDADCrJg0Ipb5JMY7GPfsrK9
kSoS5JuPQX8yxCCloyxDY+KwDj/HpaR9NHMPGis4ZUbvekCdwIRf6AU+Ozy9sH11
TtSN9HIu3vWVJnRZaxsIP1kq0gqWNVLFpzF2Q9CwkxkL5+QTc6Ginq8wdOAoKciJ
lV6WpYYNomhzNb3Fg0tQ+ToxnKYk7mq8Rj9Hk8Y8klyk4CkdakdZOuBY+HsJg6Cs
AW6kxln/6IKufJ+vqJabK7VEA9DDILe6etzrgBXOpIrgv2IkFWqMRiy343O0eIFJ
z1g32Qk4XjgLQjPWFZcAup6BDGa8LrcuQRzR8LLE2Cn6m3l2cPzRfAIXw1JF3I0Q
EJzrYtfxeYJ7uvmfCrP5xxeeu6CS8W9BonVmBwg8uUf7xpWqB9im3rbWwiOno5LS
XgFPFk3GTTJ3epZttrBQb1UCj/qRz6syzCJBhWphZ7IDMHCMwz0ciz85s7+1Zx/s
eN6fGW1/eDmLEFbPcJQaOlIoP2m2quyLm2CV1jDWzICaU5vNwNBqx4bAEO1dUWI=
=pzrL
-----END PGP MESSAGE-----
fp: A5EE826D645DBE35F9B0993358512AE87A69900F
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hF4DqDJbhoEBo+ISAQdAaNoODKpQSzZlxoH64hqL6PHGvUqW+VW82LHnncGPlWIw
SNhLu1YlZoP5Im/ypPAbBmCLwingTW6nCs86TyFT0yuTckgg9/lG2gR1dp1xGLmt
1GgBCQIQw4aYzB5FZF+TXerFEznHAZbfLEPslnCdGvbHNY8iVLONIXXL4d0/w/Hd
Pg/61K3sqELrKHJ0WKoLJs1mbVJsMJQZlccrB/nsQgOT6vb/VsvVBjz0Hz2H2jhH
YTa+odDFFyf4/w==
=gnax
-----END PGP MESSAGE-----
fp: 8F79E6CD6434700615867480D11A514F5095BFA8
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQIMAwMCBBrc/JA6AQ/+MfHuowztzKaPYiztsu5SjjCYRuo7F0Hy8BPTm+pwOVl5
omTzwKZN3y4ntG/tHKMQWf0eNC5KTYFGzEfrSUkoYYq8S3Sc9NHja/Z9dxaXOdeD
G35K7j5SrarbJ0DqbM5ocY0z6LlXn6pjzb/0sytmS+2lqG8+RV8k5oQoDpoenu9M
3JgQGONstgUJa7a8+2o81h7hQNyL74UvHts2dzaHCJADePlbbnC1mu/7+SuGcaoc
WXOj9TopgqlkOhfnNFQuDevdwpnyNP3rSnVx5bIdU8exqbLEXRIuPH1x/Je1/d94
ZP80x3CKu+u6PUexg+9hmva9eqhxBvaCcov8kYSw7fx+3ln6/nocIrjTGtZJhyca
VASrknMDPAwfl/YtpIwSnJzLL48+QAOv0o65eEiKZpVlP+hgHeQa5R8FoYbvb8Az
oGQbsKrDcljHW38OsHZfeblGQgK8h4aq1LtnxDgEpFrOPy8awSzSyUMrLDh7iqI7
Z8ANEjDOyfoNpzC/076mhKnvdqx4d+ZkqXpc69/abuwem2PK4U9FJg5vrn5X8PDT
XMNiJDDe7vUs/8qXp5KfGrgLMVEJH0yI5rbMmPamsUtluuSOIiSkNcqVgaxTb9gL
vJplfBUrpq0L9y4AZYNQ5tUDiZ2a9g0yg/ZZJi2eE23qBWGhaBrta1OtJ3/C+lPS
kAGDffOrSR8xoIAKzCmMhkFoGfOFMpR07tXSqSnaF0sKQ6cCL8BMXErcpDVKJhWc
QtZL/oL9J3WE6mr+264owKzfDnTZJsLoroTFTYzNZ2+5IYrPhtOgRwfu+YSmOd99
vAuc1OmWXaKoJYaMoPCkpHTxrWSGdOcm8UKNRG3qGEopN0giOuXj277jlPvFl9rh
Dw==
=Iy0+
-----END PGP MESSAGE-----
fp: 4F9F44A64CC2E438979329E1F122F05437696FCE
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQIMA/YLzOYaRIJJAQ/7BZqV4SwzIdBlwXm+9ZA5NTIvLcrmBvensjzIduCtqWHT
l8+SK5Mhh0wTjZI5oppuOqxVjo7pdrq2v92gIowHkIQp7WrR5l2UnMzebjvaAS8M
yOdzuFGUpyJADEvdsJoLzXXOhrbK10wflbLsduSm1nEJGMu79kj8xM3esaN88fjH
PgkmuyBcfQQvArUjxhJ7hKVusJZDhrlyj6XiaQDAF45Is+XctpwLbc8E2t1gbgPI
8Q43BXHBvfYLoUQkztqP5kFsRe2v5QtKESGIiKurE4JhF0CgSny8n/HLCK1Dg26F
JzfQ1yfmUbd4wEvovqn260sUd00H5WAUg2B6sZIqeo72EizeaA2ElIcWETRT1tqG
FabAkJuqh4doJ+rUCv0LmJmOL4b9Uja7xjcZPtyW4JOnuY6xDTh5YO88XUA6ktsB
4s3heYYwdUTEB99VrSBI89ooineCPL+d7oRuZwJT/OJKd0Jxtt2cMhJe0xNeNcwX
ILm7kQnzqq2pK0Zx3VsFDlAsqWdMsmrv1GwfCN98MSd3JIcB5JgAbrACjvQNc77N
fqnZ4FQlBSp9rCdgcnb8mahctgf6IvGLUHg8ySj+k7zq410JxfAIYeCaUllyd90q
/QfqfhehMlXWZZN5R0+BoGI8zj16osU7yi51g8n2u4DgvBV6A19nIb7TanTFCyfS
XgH6t33tJcjqCCnwLacoixny6WJy4GBxEtHmogWKNrpiduS642JmBd6LXx9sYWCO
qu+Vhf69wDc5GFfaOZ9tT1Tj8Go5njBiy/fZlDZ8Sa4DHZwnxjPZ6Xf216lKww8=
=V0vD
-----END PGP MESSAGE-----
fp: 91EBE87016391323642A6803B966009D57E69CC6
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQIMA9qJIVK2WMV7AQ//UbLwI42i3PdIUgYhIVQlGcLzBIefxdr2JnFudwqa1GOW
ASX46ZqIz+AUUxrmHARpeUZkeju66JbOvYane3LSSggBtgo7UVLIw4L98ag8Rj7P
yNgaE4ugpjH0OJt7WTo9rjIHFiYcFMSRSLn6Jwr+ri5DSKwwUn7x4bPv2XKduo7W
EKXuZ2GSMTvNqiXRhPXNuFapi7XGi06bfp8t0TkFBvBGQj4m8VRWBBqUXaehO9lB
bX9wmJ9HCcTWbRHRKU72Q/rEa44Q2Kakkf+Nwcr2I7e9qrMyYIDIgs5NDY28eMUD
e1Ieu1DIxy8uAKMTK9jDGB3/0+Tl3PLNorjjE0YFOGSgtzClJjbHH16Z+QaRIFL6
4Yat+UxptHqla+eJVznBQ/V1Q5YHkFT5PstdnKWK4Qs9NnGw3rul+f9Q+VzOHhgf
zUGg2yPxhrX+sIfTjqQFIMQgAChV/tonu2hjS8ul2v7y3B7udKuo8knCdohkUE1C
I7PRg5HuO+bfLuIB8p7/u6S9D1ZLCgu4JfCU5hQSJNofJD0NuRUXtysw7sR+oyXB
ti3QltJveCCduz7/Qmor2QrU8EvHguI/MTT6M7bhNjh9W/5M4gxyoSvQafHM825C
gwM2BdTbZ4sRz4LRRtW9fUAlV+ILJZ56yhQVVdQ1CWwUQXxbu0caeBxnchdXDoDS
XgHREHC7hYgOjrAJtC59DKUiugV+Mx7FY51/4pD6xvjUoYX2iRwrk1k0irVyqq4J
d8xNX5/zYAyzKIzPrjOC1DKDVVveLbxDeRiVTMhZm+Buk5pP1f0s3H6EV4ydKQk=
=ZMLo
-----END PGP MESSAGE-----
fp: 53B26AEDC08246715E15504B236B6291555E8401
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQIMA9XEenRNYVGHARAA1pYvIYefAJF95cIcB3tqOwMCWfCnpVa1Xp8HxxoJ1HMk
i/IhIzK+Fg/nhF/Z90Zmr/YQNtojC4BQ3gSdU0mN0i9nuYRSK6rR86me9T4F+u+8
pOJ9qfhBwaRkRPFEodfOaaaJmm6DJOOMwdb0lqB3vlaK5iW/nAi18YpaSEhPz3fL
GXQ62ralUrGKGxrpm6nYGO5bGmOzuRIqraLsouFuOJkHVjMGWVDdbUs7g/0s46y6
nJbJ4ihfDhNc+NNk9A0Iv+vZb2goKKjFah1Y/hOLOTZITDajP4jRSuvGvP1pMNmV
BbBel2PvoPfGpFommG0QRtEmc9VfXy3TnuSOOrC0BZooDyLSb8HMt1cmeX9t4bOL
lJLlD1/SzP6IGw+X2HmCakRCVW42NDWbOPuHj+YRSMsP95OEGSTVTSus2UJB33f3
A6pbnc2NVDJpsNDZFrhajhrt2TH4dFBiWCKREGeDWxm6XJOXeLX9Zm1vVtM6HtYy
9j47vB2T+GvTdnWXKbU1fL/x6jFWEwZJV0sXRp6HCez4pOt+Ki5wAN3/ZdEFaD8O
LGgRm9Zui7qqx0lXQv3HIFOpGawhwroUl1BO4yec+wm+IpFW25f+TdhmxDIG7Js0
TU3Vfj0hPnsRjwmmbm/mImtY0Bz5ch2VosV+9sqn2ehzFu7AifKi/yzu3kYcqs3S
XgGLN8npMBxBg/cevoiAq9Qkn1RXhko2FhH9hxazTvjzdJ65UiUZ9suFfAXPOsMw
i6l64MaF31TAVIpJaCPIjsx39NIsG7dn2oBhbpv+xc0W0xBsuzMj8spe5ToakEg=
=/76w
-----END PGP MESSAGE-----
fp: 4B12EFA69166CA8C23FC47E49CD3A46248B660CA
- created_at: "2024-04-15T19:33:46Z"
enc: |-
-----BEGIN PGP MESSAGE-----
hQEMA45bZkLXmBFpAQgAmkXZJVHiyEkgLimBwLLQf1zhxd90N9CfJDOt6WMO+3rc
S78RCYhaQZyt5AEbX1VJZiqyJCrSItcoY6GNasSarYT1EWsbLGQ8XD3P46eGeMVP
3clQqvt0hc7T3y+TZvjqTYDb7/ype77ELl7VyQRPqNI2e3VHcdvmziLJfTUniqoZ
bc/fs2EKRz312WhzN568fqQMck4wdkGrip2sfusCvkxzSMmE6faC1OVacKXlIFLh
RWK2nuzK3oEqS3Tak9CYBsF3mO7jBpMg6WOychiaSkqVeaMiBq0ztlBVDNewlwye
WTM5AFgPFR0jX0R9nefoksxlw0wrrBQ4t67ymLnCydJeAcleGr35GpT9WT3ecFZu
+A7aqU1b+t6rLUJVABtpsrEpYvKcRWimn+dZ3elw2b/n46XFN1isGFk+RalpDpDE
b84B1kYvwYQatDuLeOYr72PttJZtqKp6FWny+jIGqA==
=12or
-----END PGP MESSAGE-----
fp: A4B0F5A80C2E2448A97BEC25BB829C4DECA6CCB9
unencrypted_suffix: _unencrypted
version: 3.8.1

View File

@ -1,3 +1,4 @@
luks: ENC[AES256_GCM,data:oUwlNQPbCfGOY5nT9th4QhAlDwNXSDgKIyBAtZbPnH+6tqvPPS10AI7amwRgnLuJUwsE1+RzFHNA1poIlKrfjA==,iv:ivhIa2ufbgSpoPpJCC1eE8Tdaz2KeGeky/rUAyNJ5uE=,tag:zMdIbtMuAVmpeTrpxyXuXQ==,type:str]
machine-id: ENC[AES256_GCM,data:Ix/XS0rRXZhWePe41VmMarJ39a/f1kjz2ZALwWGzKa4=,iv:36fENZzal9gR/3DD4CVDq3yMmLr0rxtbMKaRDGH1Kpc=,tag:M/UmDJD0obr2wh8AnjrMSA==,type:str]
ceph:
osd.4:
@ -26,8 +27,8 @@ sops:
TWp5Ym1YNUJVVXAzSXVqMzZQY09sdWcKc1Ke2iT6RYpMxhZF6eoxeuPK2CVCygy9
uxrb+MMsUJJaybt7UKpMEgOhttCqfGPoh2lmXOOU8RKF8SgJilVuTg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2023-01-07T00:22:48Z"
mac: ENC[AES256_GCM,data:jaVrE7H3QO4+kvo7/rO6of8YnxGL67Ey2dIwfa3hpl2WDSwdmIOsav3F9BqTbYKw/MH8BeLb0skEosmoJY/991C8j2B5RNTiEIOJHVakxhRzo0vopBu33Q4C59/zOlwqqJEPRUvwhr5VizZ8HshUApOxpDbDBlBEZNXj1i2N2zM=,iv:emsmabR65nNVoKRBAJMneiIdkJIcL2g1aiV8m8PmMDY=,tag:cs3nrvcutdQUJE027wm/6Q==,type:str]
lastmodified: "2024-04-15T22:22:52Z"
mac: ENC[AES256_GCM,data:bVYN0wsSdHLKyv6Vu1HWjaI8NMqw9gbJg2KZfTbP3cjUbYpjnkyKXcDVRqX4NPhPNOxoyl/VMWYdv7DESyqkGUTFPQ/hf3LvTT/sjNVmn3wJ++bsR3QUGIbmftNvCKEFopa0L25giFK+15DEEsgcD49U++xwK1PR7+kh/YjTvYs=,iv:WCtDjc7r2dTCC9xjnY5HKXLLha3V061mB91l1vWUvsE=,tag:VmLKS4gBJfHivb8xKs395w==,type:str]
pgp:
- created_at: "2023-08-08T22:43:51Z"
enc: |
@ -167,4 +168,4 @@ sops:
-----END PGP MESSAGE-----
fp: DD0998E6CDF294537FC604F991FA5E5BF9AA901C
unencrypted_suffix: _unencrypted
version: 3.7.3
version: 3.8.1