From ccbf081be2cc2ab509ecc3d9985f2e61cf996a70 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 30 Mar 2024 22:55:48 +0100 Subject: [PATCH] rebase mediawiki --- hosts/bekkalokk/services/mediawiki/default.nix | 2 ++ hosts/bekkalokk/services/mediawiki/simplesaml-config.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/bekkalokk/services/mediawiki/default.nix b/hosts/bekkalokk/services/mediawiki/default.nix index b90c39b..dc223a9 100644 --- a/hosts/bekkalokk/services/mediawiki/default.nix +++ b/hosts/bekkalokk/services/mediawiki/default.nix @@ -19,6 +19,8 @@ substituteInPlace "$out" \ --replace '$SAML_COOKIE_SECURE' 'true' \ --replace '$SAML_COOKIE_SALT' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/cookie_salt".path}")' \ + --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_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=mediawiki_simplesamlphp"' \ diff --git a/hosts/bekkalokk/services/mediawiki/simplesaml-config.php b/hosts/bekkalokk/services/mediawiki/simplesaml-config.php index ee156ec..aded087 100644 --- a/hosts/bekkalokk/services/mediawiki/simplesaml-config.php +++ b/hosts/bekkalokk/services/mediawiki/simplesaml-config.php @@ -125,8 +125,8 @@ $config = [ * The email address will be used as the recipient address for error reports, and * also as the technical contact in generated metadata. */ - 'technicalcontact_name' => 'Administrator', - 'technicalcontact_email' => 'na@example.org', + 'technicalcontact_name' => $SAML_ADMIN_NAME, + 'technicalcontact_email' => $SAML_ADMIN_EMAIL, /* * (Optional) The method by which email is delivered. Defaults to mail which utilizes the