diff --git a/flake.lock b/flake.lock index 63b9478..1d733af 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734991663, - "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", + "lastModified": 1735264675, + "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", + "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", "type": "github" }, "original": { diff --git a/nix/application/containers.nix b/nix/application/containers.nix index c62c860..cf43197 100644 --- a/nix/application/containers.nix +++ b/nix/application/containers.nix @@ -22,6 +22,26 @@ [ config.age.secrets.atuin-env.path ]; }; + gitea = { + image = "docker.io/gitea/gitea:1.23.0-rc0-rootless"; + volumes = [ "/home/sezycei/srv/containerdata/gitea/data:/var/lib/gitea" + "/home/sezycei/srv/containerdata/gitea/config:/etc/gitea" + ]; + ports = [ "8027:3000" "23231:2222"]; + environment = + { + GITEA_APP_INI = "/etc/gitea/app.ini"; + GITEA_CUSTOM = "/var/lib/gitea/custom"; + GITEA_TEMP = "/tmp/gitea"; + GITEA_WORK_DIR = "/var/lib/gitea"; + HOME = "/var/lib/gitea/git"; + TMPDIR = "/tmp/gitea"; + USER_GID = "1000"; + USER_UID = "1000"; + }; + + }; + jellyfin = { image = "linuxserver/jellyfin:latest"; ports = [ "8096:8096" "8920:8920" ]; @@ -93,23 +113,6 @@ }; }; - softserve = { - image = "charmcli/soft-serve:v0.8.1"; - ports = [ - "23231:23231" - "23232:23232" - "23233:23233" - "9418:9418" - ]; - volumes = [ "/home/sezycei/srv/containerdata/soft-serve/data:/soft-serve" ]; - environment = { - SOFT_SERVE_NAME = "git.eversole.co"; - SOFT_SERVE_HTTP_PUBLIC_URL = "git.eversole.co"; - SOFT_SERVE_GIT_MAX_CONNECTIONS = "10"; - SOFT_SERVE_INITIAL_ADMIN_KEYS = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzsewMuoEbC0DwwNK23ZJb/ncpNtUuEgZNI2EdAsc7RnhIOhQBxj237qNMhh2mF/8hkASJZ2e4wrmNkjBM7aaz8mrcDY9rG23JMfnGiP4cU6dBC/NqHOuJypt6X28FI5I+dgw2T40sdIbkWAXOr5u5EAJcO6ROdas4zYSPHwl95s3txoGtQrQtgLHgddWMCr53n5KMwFUmqwM1ovVPZplZGaGG5m6VwBkjA0GZQPVFC+RIg6kIp9vUlsAlzPrlDqhTR32jazvaONNBsyUTuE+CJjitU4xoBs67jIFTcesMiFdThKt2HTq1AhXqiUgIfKaDvHfjzWLT8GihxDLpTBxS8G1qWlvkSja09nB/Pn1Y6XqgczM/y51OloowbvuskDZleFoapSYmJdq+rqSCoJ3JCykNGOcpdSBCucnDgR6CHEUPkJJoR0iCrK0ACEIxWhFuSterh/P8gxcH3e2PdcgxO8SfSBagdizOnDsWOw1SR8w6wVOLRrczMyx3hDXoabs= james@eversole.co"; - }; - }; - transmission = { image = "haugene/transmission-openvpn:5.3.1"; ports = [ "9091:9091" ]; diff --git a/nix/application/nginx.nix b/nix/application/nginx.nix index aee5988..2886925 100644 --- a/nix/application/nginx.nix +++ b/nix/application/nginx.nix @@ -60,12 +60,7 @@ }; "eversole.co" = proxied { target = "http://127.0.0.1:5196"; }; "flux.matri.cx" = proxied { target = "http://127.0.0.1:26343"; }; - "git.eversole.co" = { - enableACME = true; - forceSSL = true; - locations."/" = { root = "/var/www/git.eversole.co"; tryFiles = "$uri $uri/ @git"; }; - locations."@git" = { proxyPass = "http://127.0.0.1:23232"; priority = 600; }; - }; + "git.eversole.co" = proxied { target = "http://127.0.0.1:8027"; }; "graf.matri.cx" = { root = "/var/www/graf.matri.cx"; }; # refer to /monitoring/nginx.nix "hydra.matri.cx" = proxied { target = "http://127.0.0.1:3034"; diff --git a/nix/system/age.nix b/nix/system/age.nix index 13708f8..65ee55e 100644 --- a/nix/system/age.nix +++ b/nix/system/age.nix @@ -3,7 +3,6 @@ secrets = { atuin-env.file = ../../secrets/atuin-env.age; cache-key.file = ../../secrets/cache-key.age; - gitlab-runner.file = ../../secrets/gitlab-runner.age; graf-email = { file = ../../secrets/graf-email.age; mode = "770"; diff --git a/secrets.nix b/secrets.nix index 47f10e4..b816b04 100644 --- a/secrets.nix +++ b/secrets.nix @@ -8,7 +8,6 @@ in { "secrets/atuin-env.age" = { publicKeys = all; }; "secrets/cache-key.age" = { publicKeys = all; }; - "secrets/gitlab-runner.age" = { publicKeys = all; }; "secrets/graf-email.age" = { publicKeys = all; }; "secrets/htpasswd-dock.age" = { publicKeys = all; }; "secrets/keys.age" = { publicKeys = all; }; diff --git a/secrets/gitlab-runner.age b/secrets/gitlab-runner.age deleted file mode 100644 index b591799..0000000 --- a/secrets/gitlab-runner.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 dQ70Fw 1Y4XyvfewFemjm/3N6v2HKdO+kf3l9zWjR4gm+OL/Wo -7G5Ipgr3ZjRBpQrKWQoqLhAGYk1lwyGZBLsbiGi5eNo --> ssh-ed25519 ZIoeGg pxNvqGCNvjT+6DrKIfZW0O28lKY7OKRtV5uvurhFWSk -fGcCiYWChBAuHJ4764adKj+btYt410oaKtfDlJzfHR4 --> A"-uU"q-grease p] \?3MHe D, -xpBFoA2Gd3mh877T3WnAvfM6eaB4QF+PXltWXWb4vD28xAZCstZX7yFJ31W/ZUW1 -PcEj2vP/t4OpIRkjgBcrwi/iaaAOO4d1AH252iN9YlNVO0JJMWLcOxAB ---- ewj86Tn8VoLJ44f8q8eKrtFvDLpLVmJfhPydTDsm5VY -irR>vjjg -Y 1)RxC2',d﯈s(0 'dLIfl`g&—3hgAS(j \ No newline at end of file