diff options
Diffstat (limited to 'config/services/web')
| -rw-r--r-- | config/services/web/default.nix | 2 | ||||
| -rw-r--r-- | config/services/web/money/default.nix (renamed from config/services/web/quentin/ihatemoney/default.nix) | 12 | ||||
| -rw-r--r-- | config/services/web/quentin/default.nix | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/config/services/web/default.nix b/config/services/web/default.nix index 665e0c0..091fca4 100644 --- a/config/services/web/default.nix +++ b/config/services/web/default.nix @@ -1,7 +1,7 @@ { ... }: { - imports = [ ./quentin ./searx ]; + imports = [ ./money ./quentin ./searx ]; security.acme = { acceptTerms = true; diff --git a/config/services/web/quentin/ihatemoney/default.nix b/config/services/web/money/default.nix index df94392..9a84e07 100644 --- a/config/services/web/quentin/ihatemoney/default.nix +++ b/config/services/web/money/default.nix @@ -2,10 +2,11 @@ let cfg = config.services.ihatemoney; in { - services.nginx.virtualHosts."quentin.aristote.fr".locations = - lib.mkIf cfg.enable { - "/money/".proxyPass = "http://127.0.0.1${cfg.uwsgiConfig.http}/"; - }; + services.nginx.virtualHosts."money.aristote.fr" = lib.mkIf cfg.enable { + forceSSL = true; + enableACME = true; + "/".proxyPass = "http://127.0.0.1${cfg.uwsgiConfig.http}/"; + }; services.ihatemoney = { enable = true; @@ -13,9 +14,6 @@ in { adminHashedPassword = "pbkdf2:sha256:150000$s78RCYkJ$9c15a62ed1c89625cb78b5bde87d03b6dd1a03831afa4dbb2abb15ea4c1e150b"; uwsgiConfig = { http = ":8000"; }; - extraConfig = '' - APPLICATION_ROOT = "https://quentin.aristote.fr/money/" - ''; }; services.opensmtpd = lib.mkIf cfg.enable { diff --git a/config/services/web/quentin/default.nix b/config/services/web/quentin/default.nix index 78796bb..da21d59 100644 --- a/config/services/web/quentin/default.nix +++ b/config/services/web/quentin/default.nix @@ -1,8 +1,6 @@ -{ pkgs, lib, config, ... }: +{ pkgs, ... }: { - imports = [ ./ihatemoney ]; - services.nginx.virtualHosts."quentin.aristote.fr" = { locations."/".root = "${pkgs.personal.academic-webpage}"; forceSSL = true; |
