diff options
| -rw-r--r-- | hosts/ganymede/config.nix | 4 | ||||
| -rw-r--r-- | modules/services/nixos/copyparty.nix | 2 | ||||
| -rw-r--r-- | modules/services/nixos/forgejo.nix | 8 | ||||
| -rw-r--r-- | modules/services/nixos/mkCaddyCfg.nix | 17 |
4 files changed, 13 insertions, 18 deletions
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix index 63bb0b0..aaa8aec 100644 --- a/hosts/ganymede/config.nix +++ b/hosts/ganymede/config.nix @@ -62,12 +62,12 @@ forgejo = { enable = true; - privateURL = "forgejo.ganymede"; + privateUrl = "forgejo.ganymede"; }; copyparty = { enable = true; - publicURL = "up.williamsfam.us.com"; + publicUrl = "up.williamsfam.us.com"; users.collin = { isAdmin = true; diff --git a/modules/services/nixos/copyparty.nix b/modules/services/nixos/copyparty.nix index 1ef9816..7e6b40e 100644 --- a/modules/services/nixos/copyparty.nix +++ b/modules/services/nixos/copyparty.nix @@ -21,7 +21,7 @@ in { group = "fileserver"; settings = { - i = cfg.bind_host; + i = cfg.listenAddr; p = [cfg.port]; chpw = true; rproxy = "1"; diff --git a/modules/services/nixos/forgejo.nix b/modules/services/nixos/forgejo.nix index 91db5a6..9176523 100644 --- a/modules/services/nixos/forgejo.nix +++ b/modules/services/nixos/forgejo.nix @@ -18,10 +18,10 @@ in { server = { PROTOCOL = "http"; ROOT_URL = "https://${ - if cfg.publicURL - then cfg.publicURL - else if cfg.privateURL - then cfg.privateURL + if cfg.publicUrl != null + then cfg.publicUrl + else if cfg.privateUrl != null + then cfg.privateUrl else "" }"; diff --git a/modules/services/nixos/mkCaddyCfg.nix b/modules/services/nixos/mkCaddyCfg.nix index f13e40a..770b4d0 100644 --- a/modules/services/nixos/mkCaddyCfg.nix +++ b/modules/services/nixos/mkCaddyCfg.nix @@ -1,30 +1,25 @@ cfg: { networking.extraHosts = - if cfg.privateURL + if cfg.privateUrl != null then '' - 127.0.0.1 ${cfg.privateURL} + 127.0.0.1 ${cfg.privateUrl} '' else ""; services.caddy.virtualHosts = ( - if cfg.publicURL + if cfg.publicUrl != null then { - ${cfg.publicURL}.extraConfig = '' - ${ - if cfg.caddy.bind_tailscale - then "bind tailscale/${cfg.service_name}" - else "" - } + ${cfg.publicUrl}.extraConfig = '' reverse_proxy ${cfg.listenAddr}:${toString cfg.port} ''; } else {} ) // ( - if cfg.caddy.privateURL + if cfg.privateUrl != null then { - "${cfg.privateURL}.collinux".extraConfig = '' + "${cfg.privateUrl}".extraConfig = '' tls internal reverse_proxy ${cfg.listenAddr}:${toString cfg.port} ''; |