1 files changed, 6 insertions, 21 deletions
diff --git a/modules/services/amqp/activemq/default.nix b/modules/services/amqp/activemq/default.nix
index 44bf8be5878..915d179e699 100644
--- a/modules/services/amqp/activemq/default.nix
+++ b/modules/services/amqp/activemq/default.nix
@@ -89,32 +89,17 @@ in {
           Java runtime when the broker service is started.
         '';
       };
-      user = {
-        create = mkOption {
-          type = types.bool;
-          default = true;
-          description = ''
-            If true, a system user with the specified name will be added
-            to the system configuration. If false, a user with the specified
-            name is expected to exist.
-          '';
-        };
-        name = mkOption {
-          type = types.string;
-          default = "activemq";
-          description = ''
-            The name of the user that should run the ActiveMQ process.
-          '';
-        };
-      };
     };
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers = mkIf cfg.user.create (singleton {
-      inherit (cfg.user) name;
+    users.extraUsers.activemq = {
       description = "ActiveMQ server user";
-    });
+      group = "activemq";
+      uid = config.ids.uids.activemq;
+    };
+
+    users.extraGroups.activemq.gid = config.ids.gids.activemq;
 
     systemd.services.activemq_init = {
       wantedBy = [ "activemq.service" ];