rebase mediawiki

This commit is contained in:
Oystein Kristoffer Tveit 2024-03-30 22:55:48 +01:00
parent 625fa36e39
commit ccbf081be2
2 changed files with 4 additions and 2 deletions

View File

@ -19,6 +19,8 @@
substituteInPlace "$out" \ substituteInPlace "$out" \
--replace '$SAML_COOKIE_SECURE' 'true' \ --replace '$SAML_COOKIE_SECURE' 'true' \
--replace '$SAML_COOKIE_SALT' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/cookie_salt".path}")' \ --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_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( "wiki2.pvv.ntnu.no" )' \
--replace '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=mediawiki_simplesamlphp"' \ --replace '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=mediawiki_simplesamlphp"' \

View File

@ -125,8 +125,8 @@ $config = [
* The email address will be used as the recipient address for error reports, and * The email address will be used as the recipient address for error reports, and
* also as the technical contact in generated metadata. * also as the technical contact in generated metadata.
*/ */
'technicalcontact_name' => 'Administrator', 'technicalcontact_name' => $SAML_ADMIN_NAME,
'technicalcontact_email' => 'na@example.org', 'technicalcontact_email' => $SAML_ADMIN_EMAIL,
/* /*
* (Optional) The method by which email is delivered. Defaults to mail which utilizes the * (Optional) The method by which email is delivered. Defaults to mail which utilizes the