felixalb/pvv-nixos-config
1
0
Fork 0
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git synced 2025-07-08 21:33:33 +02:00
Code Issues Projects Releases Wiki Activity

fixup! WIP: enable gickup on bicep

Browse Source
This commit is contained in:
h7x4 2025-05-07 22:28:27 +02:00
parent cc9ceb0255
commit 792958edf4
No known key found for this signature in database
GPG Key ID: 9F2F7D8250F35146
3 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
hosts/bicep/services/git-mirrors/default.nix
View File

@ -1,5 +1,9 @@
{ ... }: { config, ... }:
{ {
sops.secrets."gickup/github-token" = {
owner = "gickup";
};
services.gickup = { services.gickup = {
enable = true; enable = true;
@ -13,7 +17,7 @@
instances = let instances = let
defaultGithubConfig = { defaultGithubConfig = {
# settings.token_file = ... settings.token_file = sops.secrets."gickup/github-token".path;
}; };
defaultGitlabConfig = { defaultGitlabConfig = {
# settings.token_file = ... # settings.token_file = ...
@ -28,11 +32,11 @@
"github:yushijinhun/authlib-injector" = defaultGithubConfig; "github:yushijinhun/authlib-injector" = defaultGithubConfig;
"github:Git-Mediawiki/Git-Mediawiki" = defaultGithubConfig; "github:Git-Mediawiki/Git-Mediawiki" = defaultGithubConfig;
"gitlab:mx-puppet/discord/better-discord.js" = defaultGitlabConfig; # "gitlab:mx-puppet/discord/better-discord.js" = defaultGitlabConfig;
"gitlab:mx-puppet/discord/matrix-discord-parser" = defaultGitlabConfig; # "gitlab:mx-puppet/discord/matrix-discord-parser" = defaultGitlabConfig;
"gitlab:mx-puppet/discord/discord-markdown" = defaultGitlabConfig; # "gitlab:mx-puppet/discord/discord-markdown" = defaultGitlabConfig;
"gitlab:mx-puppet/discord/mx-puppet-discord" = defaultGitlabConfig; # "gitlab:mx-puppet/discord/mx-puppet-discord" = defaultGitlabConfig;
"gitlab:mx-puppet/mx-puppet-bridge" = defaultGitlabConfig; # "gitlab:mx-puppet/mx-puppet-bridge" = defaultGitlabConfig;
"any:glibc" = { "any:glibc" = {
settings.url = "https://sourceware.org/git/glibc.git"; settings.url = "https://sourceware.org/git/glibc.git";
@ -40,24 +44,24 @@
}; };
}; };
services.cgit = let # services.cgit = let
domain = "mirrors.pvv.ntnu.no"; # domain = "mirrors.pvv.ntnu.no";
in { # in {
${domain} = { # ${domain} = {
enable = true; # enable = true;
group = "gickup"; # group = "gickup";
scanPath = "/var/lib/gickup"; # scanPath = "/var/lib/gickup";
settings = { # settings = {
enable-commit-graph = true; # enable-commit-graph = true;
enable-follow-links = true; # enable-follow-links = true;
enable-http-clone = true; # enable-http-clone = true;
enable-remote-branches = true; # enable-remote-branches = true;
clone-url = "https://${domain}/$CGIT_REPO_URL"; # clone-url = "https://${domain}/$CGIT_REPO_URL";
remove-suffix = true; # remove-suffix = true;
root-title = "https://${domain}"; # root-title = "https://${domain}";
root-desc = "PVV's repository mirroring service"; # root-desc = "PVV's repository mirroring service";
snapshots = "all"; # snapshots = "all";
}; # };
}; # };
}; # };
} }

13
modules/gickup.nix
View File

@ -183,10 +183,15 @@ in
path = format.generate "gickup-configuration-${name}.yml" { path = format.generate "gickup-configuration-${name}.yml" {
destination.local = [ cfg.destinationSettings ]; destination.local = [ cfg.destinationSettings ];
source.${instance.type} = [ source.${instance.type} = [
({ (
includeorgs = [ instance.owner ]; (lib.optionalAttrs (instance.type != "any") {
include = [ instance.repo ]; user = instance.owner;
} // instance.settings) includeorgs = [ instance.owner ];
include = [ instance.repo ];
})
//
instance.settings
)
]; ];
}; };
})) }))

8
secrets/bicep/bicep.yaml
View File

@ -3,6 +3,8 @@ calendar-bot:
mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str] mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str]
mysql: mysql:
password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str] password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str]
gickup:
github-token: ENC[AES256_GCM,data:ICv6BP/kCrpx6qPCfdEeLK2NP/3iGmmv8hkHhHdwD1qyQb5g4NYBkm+OyRM4F75WUpg3j80x7I4k1vuSeVLzOldyIQ4uK00NQ58D8Ej/Wfm0ojMQM9g4Sr+6wyor,iv:TovZIU4Cs8nriYHXlCgnj3HV6c9F4A08xFOqrM3ls14=,tag:WwgM7z0ErREUvkafFK3AeQ==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -63,8 +65,8 @@ sops:
cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX
0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg== 0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-08-15T21:18:33Z" lastmodified: "2025-05-07T20:27:27Z"
mac: ENC[AES256_GCM,data:uR5HgeDAYqoqB9kk1V6p0T30+v6WpQJi4+qIeCDRnoUPnQKUVR10hvBhICck+E+Uh8p+tGhM6Uf3YrAJAV0ZCUiNJjtwDJQQLUDT53vdOAXN4xADCQqNuhgVwVMaruoTheEiwOswRuhFeEwy0gBj3Ze2pu47lueHYclmEzumLeQ=,iv:t0UyXN2YaR2m7M/pV2wTLJG5wVfqTIUs7wSQMmyeTVw=,tag:O7dIffzrDAXz3kGx5uazhw==,type:str] mac: ENC[AES256_GCM,data:8K+epmSfXj8kne76KieVETzcinH/csyGRKIclGq0woKlSW/U6F8vhaRMQzw3Jvp/aCYYj0N5evmNsVwufgUmvBFovZ/aJ9wZXHRBrwBm9cqLxpb/inA5uB9adOQYXC6JF3RjqA/eKmXMLIuRck9WL65vB5XPny8iOZcgHJ/415w=,iv:21hG0/Ypy4EFWu4VjIgodQa7hFHyFuPSSSJtlIuLqJ8=,tag:I1d+p1V/ByJN+0pY76kOeQ==,type:str]
pgp: pgp:
- created_at: "2024-08-04T00:03:40Z" - created_at: "2024-08-04T00:03:40Z"
enc: |- enc: |-
@ -87,4 +89,4 @@ sops:
-----END PGP MESSAGE----- -----END PGP MESSAGE-----
fp: F7D37890228A907440E1FD4846B9228E814A2AAC fp: F7D37890228A907440E1FD4846B9228E814A2AAC
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.0 version: 3.9.4