Compare commits
2 Commits
852a3150b2
...
c87a967b12
Author | SHA1 | Date | |
---|---|---|---|
c87a967b12 | |||
daf15aa5be |
|
@ -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
|
||||
|
|
16
flake.lock
16
flake.lock
|
@ -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",
|
||||
|
@ -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",
|
||||
|
|
|
@ -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";
|
||||
|
@ -221,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;
|
||||
|
||||
|
@ -630,9 +628,6 @@
|
|||
./hosts/scrape
|
||||
{
|
||||
_module.args = { inherit scrapers; };
|
||||
|
||||
# TODO: migrate to sops
|
||||
nixpkgs.overlays = [ secrets.overlays.scrape ];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
|
163
hosts/mediawiki/composer.lock
generated
163
hosts/mediawiki/composer.lock
generated
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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/user".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/user".path;
|
||||
};
|
||||
scrape-impfee = makeService {
|
||||
script = "impfee";
|
||||
|
|
Loading…
Reference in New Issue
Block a user