diff --git a/flake.lock b/flake.lock index 7fc6dd7..5261786 100644 --- a/flake.lock +++ b/flake.lock @@ -1250,11 +1250,11 @@ ] }, "locked": { - "lastModified": 1721845499, - "narHash": "sha256-HigSuzXglfiChR7KwwuSNW87MZfaGAc6y4u2X6XXnS4=", + "lastModified": 1721846293, + "narHash": "sha256-j5odUYOaNs+C+uPco6hN30xEW6Sy36KcXd6rDaYMgB0=", "owner": "ivandimitrov8080", "repo": "idimitrov.dev", - "rev": "b1eb26e5f2416e742169465758481dcd69018827", + "rev": "dd2e26284d8d09322791c8277a7711a3471cba30", "type": "github" }, "original": { diff --git a/mailserver/default.nix b/mailserver/default.nix index 83187a6..775958f 100644 --- a/mailserver/default.nix +++ b/mailserver/default.nix @@ -1,3 +1,3 @@ { - imports = [ ./configuration.nix ./mailserver ./roundcube ./postgres ./wireguard ./nginx ./webshite ./tor ./i2pd ./gitea ./dnscrypt ./monero ]; + imports = [ ./configuration.nix ./mailserver ./roundcube ./postgres ./wireguard ./nginx ./tor ./i2pd ./gitea ./dnscrypt ./monero ]; } diff --git a/mailserver/nginx/default.nix b/mailserver/nginx/default.nix index 4349f06..7d9b115 100644 --- a/mailserver/nginx/default.nix +++ b/mailserver/nginx/default.nix @@ -28,7 +28,7 @@ in enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://127.0.0.1:3000"; + root = "${pkgs.webshite}"; }; extraConfig = webshiteConfig; }; @@ -36,7 +36,7 @@ in enableACME = true; forceSSL = true; locations."/" = { - proxyPass = "http://127.0.0.1:3000"; + root = "${pkgs.webshite}"; }; extraConfig = webshiteConfig; }; diff --git a/mailserver/webshite/default.nix b/mailserver/webshite/default.nix deleted file mode 100644 index 2b63312..0000000 --- a/mailserver/webshite/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: -{ - systemd.services.webshite = { - enable = true; - serviceConfig = { - ExecStart = "${pkgs.bash}/bin/bash ${pkgs.webshite}/bin/idimitrov.dev"; - Restart = "always"; - }; - wantedBy = [ "multi-user.target" ]; - }; - systemd.services.pic = { - enable = true; - serviceConfig = { - ExecStart = "${pkgs.pic}/bin/pic"; - Restart = "always"; - }; - wantedBy = [ "multi-user.target" ]; - }; -}