summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2023-05-17 18:36:29 +0200
committerGitHub <noreply@github.com>2023-05-17 18:36:29 +0200
commita919e81dbfb834e3186f1a97a48a596605e0c06f (patch)
treebdbc7338c65f5b5c1ecf44e679aa6bbf182caf95 /nixos
parent84c6233abda34e66cd15957f7372d8f6677e5be4 (diff)
parent06c774fb8e6dc1e9a867df811c93a3a37dc82706 (diff)
Merge pull request #231512 from n0emis/zammad-5.4.1
zammad: 5.1.1 -> 5.4.1
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/development/zammad.nix2
-rw-r--r--nixos/tests/zammad.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix
index 0faeb4c0e9fab..7dd143eebf12f 100644
--- a/nixos/modules/services/development/zammad.nix
+++ b/nixos/modules/services/development/zammad.nix
@@ -254,7 +254,7 @@ in
       preStart = ''
         # Blindly copy the whole project here.
         chmod -R +w .
-        rm -rf ./public/assets/*
+        rm -rf ./public/assets/
         rm -rf ./tmp/*
         rm -rf ./log/*
         cp -r --no-preserve=owner ${cfg.package}/* .
diff --git a/nixos/tests/zammad.nix b/nixos/tests/zammad.nix
index 4e466f6e3b9bf..7a2d40e82b3ed 100644
--- a/nixos/tests/zammad.nix
+++ b/nixos/tests/zammad.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix (
   {
     name = "zammad";
 
-    meta.maintainers = with lib.maintainers; [ garbas taeer ];
+    meta.maintainers = with lib.maintainers; [ garbas taeer n0emis ];
 
     nodes.machine = { config, ... }: {
       services.zammad.enable = true;