From b0f115a1ddd3bd2d8c53d27a1799bc8ee1b35212 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 20 Sep 2018 12:30:06 +0200 Subject: [PATCH] Import des overlays dans la definition des services --- services/site-max.nix | 4 ++++ services/site-musique.nix | 4 ++++ systems/LoutreOS/configuration.nix | 3 --- systems/LoutreOS/services.nix | 4 ++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/services/site-max.nix b/services/site-max.nix index 2952f2f65..95132dc27 100644 --- a/services/site-max.nix +++ b/services/site-max.nix @@ -24,6 +24,10 @@ in config = mkIf cfg.enable { + nixpkgs.overlays = [ + (import ../overlays/site-max.nix) + ]; + services.haproxy-acme.services = { ${cfg.domaine} = { ip = "127.0.0.1"; port = cfg.port; auth = false; }; }; diff --git a/services/site-musique.nix b/services/site-musique.nix index 8e6e31ae5..78f61015f 100644 --- a/services/site-musique.nix +++ b/services/site-musique.nix @@ -24,6 +24,10 @@ in config = mkIf cfg.enable { + nixpkgs.overlays = [ + (import ../overlays/site-musique.nix) + ]; + services.haproxy-acme.services = { ${cfg.domaine} = { ip = "127.0.0.1"; port = cfg.port; auth = false; }; }; diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index a15e8f892..88634e8ce 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -35,9 +35,6 @@ nixpkgs.overlays = [ (import ../../overlays/riot-web.nix) - (import ../../overlays/site-max.nix) - (import ../../overlays/site-musique.nix) - (import ../../overlays/dogetipbot-telegram.nix) (import ../../overlays/unstable_pkgs.nix) ]; diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index e6361111e..a3f81d213 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -22,6 +22,10 @@ in ../../containers/vsftpd.nix ]; + nixpkgs.overlays = [ + (import ../../overlays/dogetipbot-telegram.nix) + ]; + services = { fail2ban.enable = true;