Corrected use of nginx module

This commit is contained in:
Julien Malka 2021-12-04 14:12:36 +01:00
parent f4f5d6e869
commit c329cc16fd
9 changed files with 10 additions and 25 deletions

23
flake.lock generated
View file

@ -92,22 +92,6 @@
"type": "github"
}
},
"nixos": {
"locked": {
"lastModified": 1638371214,
"narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1638376152,
@ -158,11 +142,11 @@
},
"nur": {
"locked": {
"lastModified": 1638605839,
"narHash": "sha256-f/REgJDMli9MLdvUSU4doYPnKyC8LrAPcj35fwdM5s8=",
"lastModified": 1638622311,
"narHash": "sha256-Jcn+xvme8X57vmB1THosjYHMhUqMmKiQeLbAI9rtuEA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "3d7aba159607fb9de8f148e86afbaf585bcfa07e",
"rev": "3d283655b37acadb5485768bfb89d68e5263458e",
"type": "github"
},
"original": {
@ -174,7 +158,6 @@
"inputs": {
"home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nixos": "nixos",
"nixpkgs": "nixpkgs_3",
"nur": "nur"
}

View file

@ -2,7 +2,6 @@
description = "A flake for my personnal configurations";
inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11;
nixos.url = "github:NixOS/nixpkgs/nixos-21.11";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -14,9 +13,8 @@
};
outputs = { self, nixos, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs :
outputs = { self, home-manager, nixpkgs, neovim-nightly-overlay, nur, ... }@inputs :
{
nixosModules = builtins.listToAttrs (map (x: {
name = x;
value = import (./modules + "/${x}");

View file

@ -22,6 +22,7 @@ in {
}
(mkIf cfg.nginx.enable {
luj.nginx.enable = true;
services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
enableACME = true;
forceSSL = true;

View file

@ -24,6 +24,7 @@ in {
}
(mkIf cfg.nginx.enable {
luj.nginx.enable = true;
services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
enableACME = true;
forceSSL = true;

View file

@ -9,8 +9,6 @@ in {
config = mkIf cfg.enable {
luj.nginx.enable = true;
luj.nginx.email = "julien.malka@me.com";
luj.sonarr = {
enable = true;

View file

@ -7,6 +7,7 @@ in {
enable = mkEnableOption "activate nginx service";
email = mkOption {
type = types.str;
default = "julien.malka@me.com";
};
};

View file

@ -26,6 +26,7 @@ in {
}
(mkIf cfg.nginx.enable {
luj.nginx.enable = true;
services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
enableACME = true;
forceSSL = true;

View file

@ -26,6 +26,7 @@ in {
}
(mkIf cfg.nginx.enable {
luj.nginx.enable = true;
services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
enableACME = true;
forceSSL = true;

View file

@ -31,6 +31,7 @@ in {
}
(mkIf cfg.nginx.enable {
luj.nginx.enable = true;
services.nginx.virtualHosts."${cfg.nginx.subdomain}.julienmalka.me" = {
enableACME = true;
forceSSL = true;