rebase idp

Co-authored-by: Jørn Åne <yorinad@pvv.ntnu.no>

hosts/bekkalokk/services/idp-simplesamlphp/default.nix

@@ -75,17 +75,20 @@ in
   services.nginx.virtualHosts."idp2.pvv.ntnu.no" = {
     forceSSL = true;
     enableACME = true;
-    root = "${package}/share/php/simplesamlphp";
+    root = "${package}/share/php/simplesamlphp/public";
     locations =  {
       "/".index = "index.php";
 
+      # fastcgi_split_path_info ^(.+\.php)(/.+)$;
       "~ /(.+\\.php)" = {
         extraConfig = ''
-          fastcgi_split_path_info ^(.+\.php)(/.+)$;
           fastcgi_index index.php;
           fastcgi_pass unix:${config.services.phpfpm.pools.idp.socket};
           include ${pkgs.nginx}/conf/fastcgi_params;
           include ${pkgs.nginx}/conf/fastcgi.conf;
+
+          fastcgi_param SCRIPT_FILENAME ${package}/share/php/simplesamlphp/public/$request_filename;
+          fastcgi_param SCRIPT_NAME $request_filename;
         '';
       };
     };

hosts/bekkalokk/services/mediawiki/default.nix

@@ -17,7 +17,7 @@
         --replace '$SAML_COOKIE_SECURE' 'true' \
         --replace '$SAML_COOKIE_SALT' '"asdfasdfasjdf"' \
         --replace '$SAML_ADMIN_PASSWORD' '"asdfasdfasdf"' \
-        --replace '$SAML_TRUSTED_DOMAINS' 'array( "bekkalokk.pvv.ntnu.no" )'
+        --replace '$SAML_TRUSTED_DOMAINS' 'array( "wiki2.pvv.ntnu.no" )'
     '';
   };
 in {
@@ -80,7 +80,7 @@ in {
     };
 
     extraConfig = ''
-      $wgServer = "https://bekkalokk.pvv.ntnu.no";
+      $wgServer = "https://wiki2.pvv.ntnu.no";
       $wgLocaltimezone = "Europe/Oslo";
 
       # Only allow login through SSO
@@ -166,7 +166,7 @@ in {
     ${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/update.php --conf ${mediawikiConfig} --quick
   '';
 
-  services.nginx.virtualHosts."bekkalokk.pvv.ntnu.no" = {
+  services.nginx.virtualHosts."wiki2.pvv.ntnu.no" = {
     forceSSL = true;
     enableACME = true;
     root = "${config.services.mediawiki.finalPackage}/share/mediawiki";

hosts/bekkalokk/services/mediawiki/simplesamlphp/authsources.php

@@ -5,7 +5,7 @@ $config = array(
     'default-sp' => array(
         'saml:SP',
         # 'entityID' => 'https://wiki.pvv.ntnu.no/',
-        'entityID' => 'https://bekkalokk.pvv.ntnu.no/',
+        'entityID' => 'https://wiki2.pvv.ntnu.no/',
         'idp' => 'https://idp.pvv.ntnu.no/',
     ),
 );