forgejo: final name changes gitea → forgejo

mostly just replacing strings to avoid confusion later on. Since our
containers are now ephemeral, renaming them is basically a non-issue
(though the files under /persist/containers & the uffd client name had
to be changed manually)
This commit is contained in:
stuebinm 2024-02-25 23:24:07 +01:00
parent f29830ec93
commit 7b9e423999
4 changed files with 6 additions and 6 deletions

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, evalConfig, ... }:
{
containers.gitea = {
containers.forgejo = {
privateNetwork = true;
hostAddress = "192.168.100.1";
localAddress = "192.168.100.10";
@ -9,7 +9,7 @@
ephemeral = true;
bindMounts = {
"/persist" = {
hostPath = "/persist/containers/gitea";
hostPath = "/persist/containers/forgejo";
isReadOnly = false;
};
};
@ -94,7 +94,7 @@
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://${config.containers.gitea.localAddress}:3000";
proxyPass = "http://${config.containers.forgejo.localAddress}:3000";
};
};
}

View file

@ -65,7 +65,7 @@
table ip nat {
chain prerouting {
type nat hook prerouting priority -100
iifname enp35s0 tcp dport { 22 } dnat ${config.containers.gitea.localAddress}:22
iifname enp35s0 tcp dport { 22 } dnat ${config.containers.forgejo.localAddress}:22
}
chain postrouting {
type nat hook postrouting priority 100

View file

@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec {
hash = "sha256-KP4J1bw5u7MklaPu2SBFRNyGgkKOBOpft5MMH+em5M4=";
};
patches = [ ./gitea-magic.patch ./fix-setuppy.patch ./fix-userinfo.patch ];
patches = [ ./forgejo-magic.patch ./fix-setuppy.patch ./fix-userinfo.patch ];
propagatedBuildInputs = with python3Packages; [
flask

View file

@ -16,7 +16,7 @@ index d13fd42..94352be 100644
def userinfo():
user = request.oauth.user
+ client = request.oauth.client_id
+ if client == "gitea":
+ if client == "forgejo":
+ return jsonify(
+ id=user.unix_uid,
+ full_name=user.displayname,