summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-09-25 16:45:29 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-09-25 16:45:29 +0200
commit46bf20ecf0b4a19bd3402888dca43e0bb1419b61 (patch)
treeff85839b439fef136140eeda74047a677573ac67
parent9a13e7e86a9a202bc34efd953a95e69b1e0d69fc (diff)
downloadnixos-46bf20ecf0b4a19bd3402888dca43e0bb1419b61.tar
nixos-46bf20ecf0b4a19bd3402888dca43e0bb1419b61.tar.gz
nixos-46bf20ecf0b4a19bd3402888dca43e0bb1419b61.tar.bz2
nixos-46bf20ecf0b4a19bd3402888dca43e0bb1419b61.tar.xz
nixos-46bf20ecf0b4a19bd3402888dca43e0bb1419b61.zip
Now including prosody-modules repo
-rw-r--r--custom/prosody-modules.nix20
-rw-r--r--ymir.nix6
2 files changed, 25 insertions, 1 deletions
diff --git a/custom/prosody-modules.nix b/custom/prosody-modules.nix
new file mode 100644
index 00000000..3c103438
--- /dev/null
+++ b/custom/prosody-modules.nix
@@ -0,0 +1,20 @@
1{ stdenv
2, fetchhg
3, modules ? []
4}:
5
6let
7 copyModule = name: "cp -rv $src/${name}/* $out/;";
8 concat = a: b: a + b;
9 head = ''
10 source $stdenv/setup
11 mkdir -p $out
12 '';
13in stdenv.mkDerivation {
14 name = "prosody-modules";
15 src = fetchhg {
16 url = "http://hg.prosody.im/prosody-modules";
17 sha256 = "0nsf1j2prc6ggajn7zz9h300msf6aajqqxhy396g7j834knj5fb2";
18 };
19 builder = builtins.toFile "builder.sh" (head + (builtins.foldl' concat "" (map copyModule modules)));
20}
diff --git a/ymir.nix b/ymir.nix
index 32879953..1af6bb62 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -1,6 +1,9 @@
1{ config, pkgs, ... }: 1{ config, pkgs, ... }:
2 2
3{ 3let
4 prosodyModules = callPackage (import ./custom/prosody-modules.nix) { modules = [ "mod_auth_pam"
5 ] };
6in {
4 imports = 7 imports =
5 [ 8 [
6 ./ymir-hw.nix 9 ./ymir-hw.nix
@@ -78,6 +81,7 @@
78 ]; 81 ];
79 allowRegistration = false; 82 allowRegistration = false;
80 extraConfig = '' 83 extraConfig = ''
84 plugin_paths = { ${prosodyModules} }
81 authentication = "pam" 85 authentication = "pam"
82 log = "syslog" 86 log = "syslog"
83 ''; 87 '';