federez/nix
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

profiles/wayf: further wip work

Browse source 
Signed-off-by: Ryan Lahfa <federez-infra@lahfa.xyz>
This commit is contained in:
Ryan Lahfa 2024-08-08 16:33:53 +02:00 • committed by Jeltz
parent 3b6c3f6d70
commit c3844094b2
Signed by: jeltz
GPG key ID: 800882B66C0C3326
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkgs/switchwayf.nix
View file

@ -5,19 +5,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switch-wayf"; pname = "switch-wayf";
version = "2.0"; version = "unstable-16-02-2024";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.switch.ch"; domain = "gitlab.switch.ch";
owner = "aai"; owner = "aai";
repo = "SWITCHwayf"; repo = "SWITCHwayf";
rev = "v${version}"; rev = "96747a93f69e4a7f19f23ee241a526abe9086e2c";
hash = "sha256-SqJzkV7dJXPUrY/9pz54VYxd8eAv+aFDik9F3N4WBIg="; hash = "sha256-57apFii/P0uj2BmJqx2NLILrlqdKbI8UDUNiJpUZTMo=";
}; };
installPhase = '' installPhase = ''
mkdir -p $out/ mkdir -p $out/
cp -r www $out/ cp -r www $out/
cp -r lib $out/
ln -s $out/www/WAYF $out/www/WAYF.php ln -s $out/www/WAYF $out/www/WAYF.php
''; '';

2
profiles/wayf.nix
View file

@ -31,7 +31,6 @@ in
fastcgi_pass unix:${config.services.phpfpm.pools.switchwayf.socket}; fastcgi_pass unix:${config.services.phpfpm.pools.switchwayf.socket};
include ${config.services.nginx.package}/conf/fastcgi.conf; include ${config.services.nginx.package}/conf/fastcgi.conf;
include ${config.services.nginx.package}/conf/fastcgi_params; include ${config.services.nginx.package}/conf/fastcgi_params;
''; '';
}; };
# locations."~ /wayf/\\.php".extraConfig = '' # locations."~ /wayf/\\.php".extraConfig = ''
@ -72,6 +71,7 @@ in
metadataIDPFile = "/var/lib/switchwayf/IDProvider.metadata.conf.php"; metadataIDPFile = "/var/lib/switchwayf/IDProvider.metadata.conf.php";
metadataSPFile = "/var/lib/switchwayf/SProvider.metadata.conf.php"; metadataSPFile = "/var/lib/switchwayf/SProvider.metadata.conf.php";
WAYFLogFile = "/var/log/switchwayf/wayf.log"; WAYFLogFile = "/var/log/switchwayf/wayf.log";
SWITCHWAYF_CONFIG = "/etc/config.php";
# SWITCHWAYF_CONFIG = pkgs.writeText "switch_config.php" # SWITCHWAYF_CONFIG = pkgs.writeText "switch_config.php"
# (builtins.readFile ./switch-config.php); # (builtins.readFile ./switch-config.php);
}; };