diff --git a/pkgs/switchwayf.nix b/pkgs/switchwayf.nix index 7a3a2e7..043ce1c 100644 --- a/pkgs/switchwayf.nix +++ b/pkgs/switchwayf.nix @@ -5,19 +5,20 @@ stdenv.mkDerivation rec { pname = "switch-wayf"; - version = "2.0"; + version = "unstable-16-02-2024"; src = fetchFromGitLab { domain = "gitlab.switch.ch"; owner = "aai"; repo = "SWITCHwayf"; - rev = "v${version}"; - hash = "sha256-SqJzkV7dJXPUrY/9pz54VYxd8eAv+aFDik9F3N4WBIg="; + rev = "96747a93f69e4a7f19f23ee241a526abe9086e2c"; + hash = "sha256-57apFii/P0uj2BmJqx2NLILrlqdKbI8UDUNiJpUZTMo="; }; installPhase = '' mkdir -p $out/ cp -r www $out/ + cp -r lib $out/ ln -s $out/www/WAYF $out/www/WAYF.php ''; diff --git a/profiles/wayf.nix b/profiles/wayf.nix index 221f79c..303a582 100644 --- a/profiles/wayf.nix +++ b/profiles/wayf.nix @@ -31,7 +31,6 @@ in fastcgi_pass unix:${config.services.phpfpm.pools.switchwayf.socket}; include ${config.services.nginx.package}/conf/fastcgi.conf; include ${config.services.nginx.package}/conf/fastcgi_params; - ''; }; # locations."~ /wayf/\\.php".extraConfig = '' @@ -72,8 +71,9 @@ in metadataIDPFile = "/var/lib/switchwayf/IDProvider.metadata.conf.php"; metadataSPFile = "/var/lib/switchwayf/SProvider.metadata.conf.php"; WAYFLogFile = "/var/log/switchwayf/wayf.log"; - #SWITCHWAYF_CONFIG = pkgs.writeText "switch_config.php" - # (builtins.readFile ./switch-config.php); + SWITCHWAYF_CONFIG = "/etc/config.php"; + # SWITCHWAYF_CONFIG = pkgs.writeText "switch_config.php" + # (builtins.readFile ./switch-config.php); }; }; }