Compare commits

..

1 Commits

Author SHA1 Message Date
11855f4c5f WIP: kommode/gitea: display license in repo list
Some checks failed
Eval nix flake / evals (push) Has been cancelled
2025-03-17 20:41:09 +01:00
4 changed files with 19 additions and 26 deletions

View File

@@ -38,6 +38,10 @@ in
# Bigger icons
install -Dm444 "${cfg.package.src}/templates/repo/icon.tmpl" "$out/repo/icon.tmpl"
sed -i -e 's/24/48/g' "$out/repo/icon.tmpl"
# Show license in list view
patch -i ${./licenses-in-repo-list.diff} "${cfg.package.src}/templates/explore/repo_list.tmpl" -o repo_list.tmpl
install -Dm444 repo_list.tmpl "$out/explore/repo_list.tmpl"
'';
in ''
install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg

View File

@@ -0,0 +1,6 @@
33a34,38
> {{if .DetectedRepoLicenses}}
> <a class="flex-text-inline" href="{{.RepoLink}}/src/{{.Repository.DefaultBranch}}/{{PathEscapeSegments .LicenseFileName}}" title="{{StringUtils.Join .DetectedRepoLicenses ", "}}">
> {{svg "octicon-law"}} {{if eq (len .DetectedRepoLicenses) 1}}{{index .DetectedRepoLicenses 0}}{{else}}{{ctx.Locale.Tr "repo.multiple_licenses"}}{{end}}
> </a>
> {{end}}

View File

@@ -1,4 +1,4 @@
{config, lib, pkgs, values, ...}:
{config, lib, pkgs, ...}:
let
grg = config.services.greg-ng;
grgw = config.services.grzegorz-webui;
@@ -37,12 +37,8 @@ in {
"${machine}.pvv.org"
];
extraConfig = ''
# pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
# ntnu
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
allow 129.241.210.128/25;
allow 2001:700:300:1900::/64;
deny all;
'';
};
@@ -55,12 +51,8 @@ in {
"${machine}-backend.pvv.org"
];
extraConfig = ''
# pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
# ntnu
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
allow 129.241.210.128/25;
allow 2001:700:300:1900::/64;
deny all;
'';
@@ -78,12 +70,8 @@ in {
"${machine}-old.pvv.org"
];
extraConfig = ''
# pvv
allow ${values.ipv4-space}
allow ${values.ipv6-space}
# ntnu
allow ${values.ntnu.ipv4-space}
allow ${values.ntnu.ipv6-space}
allow 129.241.210.128/25;
allow 2001:700:300:1900::/64;
deny all;
'';

View File

@@ -1,13 +1,8 @@
# Feel free to change the structure of this file
let
ntnu-ipv4 = suffix: "129.241.${toString suffix}";
ntnu-ipv6 = suffix: "2001:700:300:${toString suffix}";
pvv-ipv4 = suffix: ntnu-ipv4 "210.${toString suffix}";
pvv-ipv6 = suffix: ntnu-ipv6 "1900::${toString suffix}";
pvv-ipv4 = suffix: "129.241.210.${toString suffix}";
pvv-ipv6 = suffix: "2001:700:300:1900::${toString suffix}";
in rec {
ntnu.ipv4-space = ntnu-ipv4 "0.0/16"; # https://ipinfo.io/ips/129.241.0.0/16
ntnu.ipv6-space = ntnu-ipv6 ":/48"; # https://ipinfo.io/2001:700:300::
ipv4-space = pvv-ipv4 "128/25";
ipv6-space = pvv-ipv6 "/64";