diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 12:16:33 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 12:16:33 +0100 |
commit | 889351af8b8a9e8bb39dbd09dc56691a28b9d823 (patch) | |
tree | 0a8ca0a76ed8c8df86b6071f7fc50004a3a26f62 /nixos/modules/services/amqp | |
parent | 69ec09f38aa1f1d37baec73ebdf9cf5f21050f94 (diff) | |
download | nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.gz nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.bz2 nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.lz nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.xz nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.tar.zst nixlib-889351af8b8a9e8bb39dbd09dc56691a28b9d823.zip |
Revert "Merge #12357: nixos docs: show references to packages"
The PR wasn't good enough yet. This reverts commit b2a37ceeea8c38ec71447f8dae1e6890a8cf982d, reversing changes made to 7fa9a1abce623aaf18b22f5dca3fc8a44a494e8d.
Diffstat (limited to 'nixos/modules/services/amqp')
-rw-r--r-- | nixos/modules/services/amqp/activemq/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f97617664..56ff388f8a9e 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -32,7 +32,6 @@ in { ''; }; configurationDir = mkOption { - default = "${activemq}/conf"; description = '' The base directory for ActiveMQ's configuration. By default, this directory is searched for a file named activemq.xml, @@ -126,6 +125,8 @@ in { ''; }; + services.activemq.configurationDir = mkDefault "${activemq}/conf"; + }; } |