summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-09-30 16:32:07 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2015-09-30 16:32:07 +0200
commitd413934671078c3f070d16d7ed9518319b8a8d36 (patch)
tree0d3ff8735c7dfb69a9dc289f2385d06cbdc66f69
parentdbe16bdd8827d83ebfeb02968a18adc6ea1585b4 (diff)
downloadnixos-d413934671078c3f070d16d7ed9518319b8a8d36.tar
nixos-d413934671078c3f070d16d7ed9518319b8a8d36.tar.gz
nixos-d413934671078c3f070d16d7ed9518319b8a8d36.tar.bz2
nixos-d413934671078c3f070d16d7ed9518319b8a8d36.tar.xz
nixos-d413934671078c3f070d16d7ed9518319b8a8d36.zip
registered custom auth with ymir
-rw-r--r--ymir.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/ymir.nix b/ymir.nix
index a4bef801..58430306 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -1,8 +1,9 @@
1{ config, pkgs, ... }: 1{ config, pkgs, ... }:
2 2
3let 3let
4 luaPam = pkgs.callPackage ./custom/luaPam.nix {}; 4 luaPam = pkgs.callPackage ./custom/luaPam.nix {};
5 luaPosix = pkgs.callPackage ./custom/luaPosix.nix {}; 5 luaPosix = pkgs.callPackage ./custom/luaPosix.nix {};
6 prosodyAuth = pkgs.callPackage ./custom/prosody-auth.nix {};
6in { 7in {
7 imports = 8 imports =
8 [ 9 [
@@ -28,7 +29,7 @@ in {
28 prosody = pkgs.callPackage ./customized/prosody.nix ({ 29 prosody = pkgs.callPackage ./customized/prosody.nix ({
29 inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; 30 inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;
30 lua5 = pkgs.lua5_1; 31 lua5 = pkgs.lua5_1;
31 extraModules = ["mod_auth_pam"]; 32 extraModules = [prosodyAuth];
32 extraLibs = [luaPam luaPosix]; 33 extraLibs = [luaPam luaPosix];
33 }); 34 });
34 }; 35 };
@@ -98,10 +99,10 @@ in {
98 ]; 99 ];
99 allowRegistration = false; 100 allowRegistration = false;
100 extraModules = [ "private" 101 extraModules = [ "private"
101 "auth_pam" 102 "auth_custom"
102 ]; 103 ];
103 extraConfig = '' 104 extraConfig = ''
104 authentication="pam" 105 authentication="custom"
105 ''; 106 '';
106 107
107 virtualHosts.default = { 108 virtualHosts.default = {