containers/citrine: fix forwarding
This commit is contained in:
parent
49c161e8ab
commit
27cf526c47
2 changed files with 11 additions and 12 deletions
|
|
@ -1,7 +1,7 @@
|
|||
{ config, lib, ... }: {
|
||||
system.stateVersion = "25.11";
|
||||
networking.firewall.allowedTCPPorts = [ 3000 ];
|
||||
networking.firewall.allowedUDPPorts = [ 3000 ];
|
||||
networking.firewall.allowedTCPPorts = [ 22 3000 ];
|
||||
networking.firewall.allowedUDPPorts = [ 22 3000 ];
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"L+ /persist/forgejo/custom/templates - - - - ${./templates}"
|
||||
|
|
@ -16,6 +16,9 @@
|
|||
DOMAIN = "garden.lava.moe";
|
||||
ROOT_URL = "https://garden.lava.moe/";
|
||||
HTTP_PORT = 3000;
|
||||
START_SSH_SERVER = true;
|
||||
BUILTIN_SSH_SERVER_USER = "git";
|
||||
SSH_DOMAIN = "git.lava.moe";
|
||||
};
|
||||
ui = lib.mkForce {
|
||||
DEFAULT_THEME = "catppuccin-maroon-auto";
|
||||
|
|
@ -35,6 +38,12 @@
|
|||
stateDir = "/persist/forgejo";
|
||||
};
|
||||
|
||||
systemd.services.forgejo.serviceConfig = {
|
||||
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
|
||||
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
|
||||
PrivateUsers = lib.mkForce false;
|
||||
};
|
||||
|
||||
catppuccin.forgejo.enable = true;
|
||||
|
||||
environment.systemPackages = [ config.services.forgejo.package ];
|
||||
|
|
|
|||
|
|
@ -18,16 +18,6 @@
|
|||
name = "citrine";
|
||||
subnet = "3";
|
||||
in {
|
||||
# TODO: this is likely dandelion specific
|
||||
networking.firewall.extraCommands = ''
|
||||
ip6tables -t nat -A PREROUTING -d fd0d::1:1003 -p tcp --dport 22 -j DNAT --to-destination fd0d:1::${subnet}:2
|
||||
ip6tables -t nat -A POSTROUTING -d fd0d:1::${subnet}:2 -p tcp --dport 22 -j SNAT --to-source fd0d::1:1003
|
||||
'';
|
||||
networking.firewall.extraStopCommands = ''
|
||||
ip6tables -t nat -D PREROUTING -d fd0d::1:1003 -p tcp --dport 22 -j DNAT --to-destination fd0d:1::${subnet}:2 || true
|
||||
ip6tables -t nat -D POSTROUTING -d fd0d:1::${subnet}:2 -p tcp --dport 22 -j SNAT --to-source fd0d::1:1003 || true
|
||||
'';
|
||||
|
||||
services.nginx.virtualHosts."garden.lava.moe" = {
|
||||
useACMEHost = "lava.moe";
|
||||
forceSSL = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue