From a55c908fe7c79546dee9efbd5dd27a1b2151d133 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Tue, 2 Apr 2024 19:54:28 +0200
Subject: [PATCH] bekkalokk/mediawiki: change domain from wiki2 to wiki

---
 hosts/bekkalokk/services/mediawiki/default.nix            | 8 ++++----
 .../services/mediawiki/simplesaml-authsources.php         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hosts/bekkalokk/services/mediawiki/default.nix b/hosts/bekkalokk/services/mediawiki/default.nix
index 0170b662..b3c80dba 100644
--- a/hosts/bekkalokk/services/mediawiki/default.nix
+++ b/hosts/bekkalokk/services/mediawiki/default.nix
@@ -22,7 +22,7 @@
           --replace '$SAML_ADMIN_NAME' '"Drift"' \
           --replace '$SAML_ADMIN_EMAIL' '"drift@pvv.ntnu.no"' \
           --replace '$SAML_ADMIN_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/admin_password".path}")' \
-          --replace '$SAML_TRUSTED_DOMAINS' 'array( "wiki2.pvv.ntnu.no" )' \
+          --replace '$SAML_TRUSTED_DOMAINS' 'array( "wiki.pvv.ntnu.no" )' \
           --replace '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=mediawiki_simplesamlphp"' \
           --replace '$SAML_DATABASE_USERNAME' '"mediawiki_simplesamlphp"' \
           --replace '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/postgres_password".path}")' \
@@ -31,7 +31,7 @@
     };
   };
 in {
-  services.idp.sp-remote-metadata = [ "https://wiki2.pvv.ntnu.no/simplesaml/" ];
+  services.idp.sp-remote-metadata = [ "https://wiki.pvv.ntnu.no/simplesaml/" ];
 
   sops.secrets = lib.pipe [
     "mediawiki/password"
@@ -93,7 +93,7 @@ in {
     };
 
     extraConfig = ''
-      $wgServer = "https://wiki2.pvv.ntnu.no";
+      $wgServer = "https://wiki.pvv.ntnu.no";
       $wgLocaltimezone = "Europe/Oslo";
 
       # Only allow login through SSO
@@ -156,7 +156,7 @@ in {
 
   users.groups.mediawiki.members = [ "nginx" ];
 
-  services.nginx.virtualHosts."wiki2.pvv.ntnu.no" = {
+  services.nginx.virtualHosts."wiki.pvv.ntnu.no" = {
     forceSSL = true;
     enableACME = true;
     root = "${config.services.mediawiki.finalPackage}/share/mediawiki";
diff --git a/hosts/bekkalokk/services/mediawiki/simplesaml-authsources.php b/hosts/bekkalokk/services/mediawiki/simplesaml-authsources.php
index 90b0153b..32824848 100644
--- a/hosts/bekkalokk/services/mediawiki/simplesaml-authsources.php
+++ b/hosts/bekkalokk/services/mediawiki/simplesaml-authsources.php
@@ -5,7 +5,7 @@ $config = array(
     ),
     'default-sp' => array(
         'saml:SP',
-        'entityID' => 'https://wiki2.pvv.ntnu.no/simplesaml/',
+        'entityID' => 'https://wiki.pvv.ntnu.no/simplesaml/',
         'idp' => 'https://idp2.pvv.ntnu.no/',
     ),
 );