migrated forgejo to h001, removed from lio
This commit is contained in:
RingOfStorms (Joshua Bell)
parent
38fde325ab
commit
43e095513b
5 changed files with 52 additions and 103 deletions
53
hosts/linode/l002/flake.lock
generated
53
hosts/linode/l002/flake.lock
generated
|
|
@ -32,17 +32,17 @@
|
|||
"ragenix": "ragenix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742406125,
|
||||
"narHash": "sha256-+NQNj2IMJuEiymB+YrcZkxeZt7QlC+Bwe5rWgRRHKrU=",
|
||||
"lastModified": 1745965414,
|
||||
"narHash": "sha256-Vn/sXOtIj5y09jGKw3iaLIrpqW5h37vW1vFBmFehRx8=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "138565efadeed6baf2a632c5dcc95a2031c77f86",
|
||||
"revCount": 371,
|
||||
"rev": "3d4d7d88290dd1f55542691d3ac45b2a5f021709",
|
||||
"revCount": 430,
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/dotfiles"
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/dotfiles"
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
|
|
@ -143,11 +143,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742234739,
|
||||
"narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
|
||||
"lastModified": 1744743431,
|
||||
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
|
||||
"owner": "rycee",
|
||||
"repo": "home-manager",
|
||||
"rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
|
||||
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -198,11 +198,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1742069588,
|
||||
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
|
||||
"lastModified": 1744463964,
|
||||
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
|
||||
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -675,22 +675,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim_plugin-lvimuser/lsp-inlayhints.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1686236485,
|
||||
"narHash": "sha256-06CiJ+xeMO4+OJkckcslqwloJyt2gwg514JuxV6KOfQ=",
|
||||
"owner": "lvimuser",
|
||||
"repo": "lsp-inlayhints.nvim",
|
||||
"rev": "d981f65c9ae0b6062176f0accb9c151daeda6f16",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lvimuser",
|
||||
"repo": "lsp-inlayhints.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim_plugin-m4xshen/hardtime.nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1245,7 +1229,6 @@
|
|||
"nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim",
|
||||
"nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim",
|
||||
"nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim",
|
||||
"nvim_plugin-lvimuser/lsp-inlayhints.nvim": "nvim_plugin-lvimuser/lsp-inlayhints.nvim",
|
||||
"nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim",
|
||||
"nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree",
|
||||
"nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint",
|
||||
|
|
@ -1280,17 +1263,17 @@
|
|||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742226527,
|
||||
"narHash": "sha256-CT9227XXn1t8H1ivNBBkBcf+npB7tWk5yzEQoJvbGVU=",
|
||||
"lastModified": 1745585761,
|
||||
"narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "e8bafafc36fb2227dab8f0ddb67a2439d9077091",
|
||||
"revCount": 268,
|
||||
"rev": "e5523910a0c07c88d026d006f5962434bfa53548",
|
||||
"revCount": 277,
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/nvim"
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/nvim"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/nvim"
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/nvim"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@
|
|||
};
|
||||
programs = {
|
||||
tailnet.enable = true;
|
||||
tailnet.useSecretsAuth = false;
|
||||
ssh.enable = true;
|
||||
};
|
||||
users = {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://100.64.0.1";
|
||||
proxyPass = "http://100.64.0.13";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
streamConfig = ''
|
||||
server {
|
||||
listen 3032;
|
||||
proxy_pass 100.64.0.1:3032;
|
||||
proxy_pass 100.64.0.13:3032;
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
|
||||
# NOTE some useful links
|
||||
# nixos containers: https://blog.beardhatcode.be/2020/12/Declarative-Nixos-Containers.html
|
||||
# https://nixos.wiki/wiki/NixOS_Containers
|
||||
|
|
@ -11,7 +10,7 @@
|
|||
|
||||
imports = [
|
||||
common.nixosModules.containers.librechat
|
||||
common.nixosModules.containers.forgejo
|
||||
# common.nixosModules.containers.forgejo
|
||||
];
|
||||
|
||||
config = {
|
||||
|
|
@ -26,33 +25,33 @@
|
|||
firewall.trustedInterfaces = [ "ve-*" ];
|
||||
};
|
||||
|
||||
containers.wasabi = {
|
||||
ephemeral = true;
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostAddress = "10.0.0.1";
|
||||
localAddress = "10.0.0.111";
|
||||
config =
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
system.stateVersion = "24.11";
|
||||
services.httpd.enable = true;
|
||||
services.httpd.adminAddr = "foo@example.org";
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [ 80 ];
|
||||
};
|
||||
};
|
||||
};
|
||||
# containers.wasabi = {
|
||||
# ephemeral = true;
|
||||
# autoStart = true;
|
||||
# privateNetwork = true;
|
||||
# hostAddress = "10.0.0.1";
|
||||
# localAddress = "10.0.0.111";
|
||||
# config =
|
||||
# { config, pkgs, ... }:
|
||||
# {
|
||||
# system.stateVersion = "24.11";
|
||||
# services.httpd.enable = true;
|
||||
# services.httpd.adminAddr = "foo@example.org";
|
||||
# networking.firewall = {
|
||||
# enable = true;
|
||||
# allowedTCPPorts = [ 80 ];
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
virtualisation.oci-containers.containers = {
|
||||
ntest = {
|
||||
image = "nginx:alpine";
|
||||
ports = [
|
||||
"127.0.0.1:8085:80"
|
||||
];
|
||||
};
|
||||
};
|
||||
# virtualisation.oci-containers.containers = {
|
||||
# ntest = {
|
||||
# image = "nginx:alpine";
|
||||
# ports = [
|
||||
# "127.0.0.1:8085:80"
|
||||
# ];
|
||||
# };
|
||||
# };
|
||||
|
||||
virtualisation.oci-containers.backend = "docker";
|
||||
|
||||
|
|
@ -63,45 +62,13 @@
|
|||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
virtualHosts = {
|
||||
# "local.belljm.com" = {
|
||||
# # enableACME = true;
|
||||
# # forceSSL = true;
|
||||
# locations."/".proxyPass = "http://${config.containers.wasabi.localAddress}:80";
|
||||
# };
|
||||
# "127.0.0.1" = {
|
||||
# locations."/wasabi/" = {
|
||||
# extraConfig = ''
|
||||
# rewrite ^/wasabi/(.*) /$1 break;
|
||||
# '';
|
||||
# proxyPass = "http://${config.containers.wasabi.localAddress}:80/";
|
||||
# };
|
||||
# locations."/" = {
|
||||
# return = "404"; # or 444 for drop
|
||||
# };
|
||||
# };
|
||||
"git.joshuabell.xyz" = {
|
||||
# GIT passthrough
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.2:3000";
|
||||
};
|
||||
};
|
||||
|
||||
"_" = {
|
||||
default = true;
|
||||
locations."/" = {
|
||||
return = "404"; # or 444 for drop
|
||||
return = "444"; # or 444 for drop
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# STREAMS
|
||||
streamConfig = ''
|
||||
server {
|
||||
listen 3032;
|
||||
proxy_pass 10.0.0.2:3032;
|
||||
}
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
|
|
|
|||
8
hosts/lio/flake.lock
generated
8
hosts/lio/flake.lock
generated
|
|
@ -32,11 +32,11 @@
|
|||
"ragenix": "ragenix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745957989,
|
||||
"narHash": "sha256-mLYJXPri4DVRa6exEPtzlkje5FZVSYAteObHOxcAvfA=",
|
||||
"lastModified": 1745977922,
|
||||
"narHash": "sha256-Rufv1nlw2OlAzpN+Iz2wf+3RKWRkGVHWaXP+PCtyug0=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "6277d06b4dcaa6665e92aaf5f20eee49a8362556",
|
||||
"revCount": 426,
|
||||
"rev": "38fde325abbec819b876998ff006fe31a8f4e228",
|
||||
"revCount": 431,
|
||||
"type": "git",
|
||||
"url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue