about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorDejan Lukan <dejan@proteansec.com>2018-03-19 10:26:46 +0100
committerDejan Lukan <dejan@proteansec.com>2018-11-01 21:28:16 +0100
commit02a3726a1256fa0e144c302537c8b0876bfee77f (patch)
tree3ef7f4bc590b5be5202ef69a8b904b166356a058 /nixos
parent4d8749e9503d774769f0347af2d6a5118b639c05 (diff)
downloadnixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.tar
nixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.tar.gz
nixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.tar.bz2
nixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.tar.lz
nixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.tar.xz
nixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.tar.zst
nixlib-02a3726a1256fa0e144c302537c8b0876bfee77f.zip
bacula: 5.2.13 -> 9.2.1
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/backup/bacula.nix24
1 files changed, 18 insertions, 6 deletions
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 340b0cf07234..3e1c488d5d83 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -357,8 +357,12 @@ in {
       description = "Bacula File Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
-      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
-      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      serviceConfig = {
+        ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        LogsDirectory = "bacula";
+        StateDirectory = "bacula";
+      };
     };
 
     systemd.services.bacula-sd = mkIf sd_cfg.enable {
@@ -366,8 +370,12 @@ in {
       description = "Bacula Storage Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
-      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
-      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      serviceConfig = {
+        ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        LogsDirectory = "bacula";
+        StateDirectory = "bacula";
+      };
     };
 
     services.postgresql.enable = dir_cfg.enable == true;
@@ -377,8 +385,12 @@ in {
       description = "Bacula Director Daemon";
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.bacula ];
-      serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
-      serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      serviceConfig = {
+        ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        LogsDirectory = "bacula";
+        StateDirectory = "bacula";
+      };
       preStart = ''
         if ! test -e "${libDir}/db-created"; then
             ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole bacula