From 9a9316b31fc82c6d029d38ac1666b9274b7d5a2b Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Sat, 23 Dec 2023 14:27:04 -0700 Subject: [PATCH] Include the `forgejo` service. --- hive/deimos/default.nix | 65 +++++++++++++++++++++++------------------ hive/phobos/default.nix | 53 ++++++++++++++++----------------- 2 files changed, 63 insertions(+), 55 deletions(-) diff --git a/hive/deimos/default.nix b/hive/deimos/default.nix index 232857c..8ea4dbe 100644 --- a/hive/deimos/default.nix +++ b/hive/deimos/default.nix @@ -24,40 +24,47 @@ in programs.mosh.enable = true; - services.openssh.enable = true; + services = { + nginx = { + enable = true; + virtualHosts = { + "www.jrpotter.com" = { + forceSSL = true; + enableACME = true; + serverAliases = [ "jrpotter.com" ]; + locations."/" = { + root = portfolio.packages.${system}.app; + }; + }; + "blog.jrpotter.com" = { + forceSSL = true; + enableACME = true; + locations."/" = { + root = blog.packages.${system}.app; + }; + }; + "bookshelf.jrpotter.com" = { + forceSSL = true; + enableACME = true; + locations."/" = { + root = bookshelf.packages.${system}.app; + }; + }; + "git.jrpotter.com" = { + locations."/" = { + recommendedProxySettings = true; + proxyPass = "http://127.0.0.1:3000"; + }; + }; + }; + }; + openssh.enable = true; + }; security.acme = { acceptTerms = true; defaults.email = "jrpotter2112@gmail.com"; }; - services.nginx = { - enable = true; - virtualHosts = { - "www.jrpotter.com" = { - forceSSL = true; - enableACME = true; - serverAliases = [ "jrpotter.com" ]; - locations."/" = { - root = portfolio.packages.${system}.app; - }; - }; - "blog.jrpotter.com" = { - forceSSL = true; - enableACME = true; - locations."/" = { - root = blog.packages.${system}.app; - }; - }; - "bookshelf.jrpotter.com" = { - forceSSL = true; - enableACME = true; - locations."/" = { - root = bookshelf.packages.${system}.app; - }; - }; - }; - }; - system.stateVersion = "23.11"; } diff --git a/hive/phobos/default.nix b/hive/phobos/default.nix index 7d99c32..5467645 100644 --- a/hive/phobos/default.nix +++ b/hive/phobos/default.nix @@ -23,17 +23,33 @@ in programs.mosh.enable = true; - services.openssh.enable = true; - - services.postgresql = { - enable = true; - package = pkgs.postgresql_15; - ensureDatabases = [ "boardwise" ]; - authentication = lib.mkOverride 10 '' - # TYPE DATABASE USER ADDRESS METHOD - local all all trust - host all all 127.0.0.1/32 trust - ''; + services = { + forgejo.enable = true; + nginx = { + enable = true; + virtualHosts = { + "www.boardwise.gg" = { + forceSSL = true; + enableACME = true; + serverAliases = [ "boardwise.gg" ]; + locations."/" = { + recommendedProxySettings = true; + proxyPass = "http://127.0.0.1:4000"; + }; + }; + }; + }; + openssh.enable = true; + postgresql = { + enable = true; + package = pkgs.postgresql_15; + ensureDatabases = [ "boardwise" ]; + authentication = lib.mkOverride 10 '' + # TYPE DATABASE USER ADDRESS METHOD + local all all trust + host all all 127.0.0.1/32 trust + ''; + }; }; systemd.services.boardwise = { @@ -66,20 +82,5 @@ in defaults.email = "jrpotter2112@gmail.com"; }; - services.nginx = { - enable = true; - virtualHosts = { - "www.boardwise.gg" = { - forceSSL = true; - enableACME = true; - serverAliases = [ "boardwise.gg" ]; - locations."/" = { - recommendedProxySettings = true; - proxyPass = "http://127.0.0.1:4000"; - }; - }; - }; - }; - system.stateVersion = "23.11"; }