diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-23 20:06:39 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-23 20:08:23 +0200 |
commit | a3777ba4f959ae7fa10561b953c6e10add125fa8 (patch) | |
tree | a0d4298f294032e5d8f14e172f7c75be3040c0a2 /nixos/modules/services | |
parent | 8166b12f0c861f442014433f2e3077522da7dd55 (diff) | |
download | nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.tar nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.tar.gz nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.tar.bz2 nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.tar.lz nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.tar.xz nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.tar.zst nixlib-a3777ba4f959ae7fa10561b953c6e10add125fa8.zip |
Remove dependencies on the Nixpkgs location
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/audio/fuppes.nix | 5 | ||||
-rw-r--r-- | nixos/modules/services/databases/mysql.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/databases/mysql55.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/ejabberd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/nixos/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix index df73e62fc942..9c8849e525b3 100644 --- a/nixos/modules/services/audio/fuppes.nix +++ b/nixos/modules/services/audio/fuppes.nix @@ -60,8 +60,7 @@ with pkgs.lib; }; vfolder = mkOption { - default = ./fuppes/vfolder.cfg; - example = /etc/fuppes/vfolder.cfg; + example = literalExample "/etc/fuppes/vfolder.cfg"; description = '' XML file describing the layout of virtual folder visible by the client. @@ -109,6 +108,8 @@ with pkgs.lib; services.fuppesd.name = mkDefault config.networking.hostName; + services.fuppesd.vfolder = mkDefault ./fuppes/vfolder.cfg; + security.sudo.enable = true; }; } diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 663c2cc4505a..8be05a27cdcb 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -93,8 +93,8 @@ in default = []; description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL"; example = [ - { name = "foodatabase"; schema = ./foodatabase.sql; } - { name = "bardatabase"; schema = ./bardatabase.sql; } + { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; } + { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; } ]; }; diff --git a/nixos/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix index 46148d68f4c6..fe8b29e3c6b7 100644 --- a/nixos/modules/services/databases/mysql55.nix +++ b/nixos/modules/services/databases/mysql55.nix @@ -86,8 +86,8 @@ in default = []; description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL"; example = [ - { name = "foodatabase"; schema = ./foodatabase.sql; } - { name = "bardatabase"; schema = ./bardatabase.sql; } + { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; } + { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; } ]; }; diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix index 05e0aba7d70e..75950f55a279 100644 --- a/nixos/modules/services/networking/ejabberd.nix +++ b/nixos/modules/services/networking/ejabberd.nix @@ -44,7 +44,7 @@ in loadDumps = mkOption { default = []; description = "Configuration dump that should be loaded on the first startup"; - example = [ ./myejabberd.dump ]; + example = literalExample "[ ./myejabberd.dump ]"; }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index c85c9307e3e4..f5670ccdcbfa 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -181,11 +181,11 @@ in example = [ { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; - publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; + publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub"; } { hostNames = [ "myhost2" ]; - publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; + publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub"; } ]; options = { |