ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2024-09-22 11:22:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix conditions for enabling services

Browse Source 
Without this fix, kresd and others would get enabled even though the
main mailserver option is disabled.
This commit is contained in:
Silvan Mosberger 2018-05-22 23:08:49 +02:00
parent 68232ddf87
commit 845e06e61a
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail-server/borgbackup.nix
View File

@ -56,7 +56,7 @@ let
${cmdPostexec} ${cmdPostexec}
''; '';
in { in {
config = lib.mkIf config.mailserver.borgbackup.enable { config = lib.mkIf (config.mailserver.enable && cfg.enable) {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
borgbackup borgbackup
]; ];

2
mail-server/clamav.nix
View File

@ -20,7 +20,7 @@ let
cfg = config.mailserver; cfg = config.mailserver;
in in
{ {
config = lib.mkIf cfg.virusScanning { config = lib.mkIf (cfg.enable && cfg.virusScanning) {
services.clamav.daemon.enable = true; services.clamav.daemon.enable = true;
services.clamav.updater.enable = true; services.clamav.updater.enable = true;
}; };

2
mail-server/kresd.nix
View File

@ -20,7 +20,7 @@ let
cfg = config.mailserver; cfg = config.mailserver;
in in
{ {
config = lib.mkIf cfg.localDnsResolver { config = lib.mkIf (cfg.enable && cfg.localDnsResolver) {
services.kresd.enable = true; services.kresd.enable = true;
networking.nameservers = [ "127.0.0.1" ]; networking.nameservers = [ "127.0.0.1" ];
}; };

2
mail-server/monit.nix
View File

@ -20,7 +20,7 @@ let
cfg = config.mailserver; cfg = config.mailserver;
in in
{ {
config = lib.mkIf cfg.monitoring.enable { config = lib.mkIf (cfg.enable && cfg.monitoring.enable) {
services.monit = { services.monit = {
enable = true; enable = true;
config = '' config = ''

2
mail-server/nginx.nix
View File

@ -24,7 +24,7 @@ let
acmeRoot = "/var/lib/acme/acme-challenge"; acmeRoot = "/var/lib/acme/acme-challenge";
in in
{ {
config = lib.mkIf (cfg.certificateScheme == 3) { config = lib.mkIf (cfg.enable && cfg.certificateScheme == 3) {
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts."${cfg.fqdn}" = { virtualHosts."${cfg.fqdn}" = {

2
mail-server/post-upgrade-check.nix
View File

@ -22,7 +22,7 @@ let
cfg = config.mailserver; cfg = config.mailserver;
in in
{ {
config = mkIf cfg.rebootAfterKernelUpgrade.enable { config = mkIf (cfg.enable && cfg.rebootAfterKernelUpgrade.enable) {
systemd.services.nixos-upgrade.serviceConfig.ExecStartPost = pkgs.writeScript "post-upgrade-check" '' systemd.services.nixos-upgrade.serviceConfig.ExecStartPost = pkgs.writeScript "post-upgrade-check" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}

2
mail-server/rsnapshot.nix
View File

@ -39,7 +39,7 @@ let
''; '';
postexecString = optionalString postexecDefined "cmd_postexec ${postexecWrapped}"; postexecString = optionalString postexecDefined "cmd_postexec ${postexecWrapped}";
in { in {
config = mkIf cfg.backup.enable { config = mkIf (cfg.enable && cfg.backup.enable) {
services.rsnapshot = { services.rsnapshot = {
enable = true; enable = true;
cronIntervals = cfg.backup.cronIntervals; cronIntervals = cfg.backup.cronIntervals;