Drift/pvv-nixos-config
Drift
/
pvv-nixos-config
16
4
Fork 1
Code Issues Pull Requests 6 Wiki Activity

rebase secrets
Eval nix flake / evals (push) Failing after 1m48s Details

This commit is contained in:
Oystein Kristoffer Tveit 2024-03-30 22:56:01 +01:00
parent ccbf081be2
commit 205fba0a10
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hosts/bekkalokk/services/idp-simplesamlphp/config.php
View File

@ -476,13 +476,13 @@ $config = [
* Ensure that you have the required PDO database driver installed * Ensure that you have the required PDO database driver installed
* for your connection string. * for your connection string.
*/ */
'database.dsn' => 'postgres:host=bicep.pvv.ntnu.no;dbname=idp', 'database.dsn' => $SAML_DATABASE_DSN,
/* /*
* SQL database credentials * SQL database credentials
*/ */
'database.username' => 'idp', 'database.username' => $SAML_DATABASE_USERNAME,
'database.password' => 'secret', 'database.password' => $SAML_DATABASE_PASSWORD,
'database.options' => [], 'database.options' => [],
/* /*
@ -1195,13 +1195,13 @@ $config = [
* See http://www.php.net/manual/en/pdo.drivers.php for the various * See http://www.php.net/manual/en/pdo.drivers.php for the various
* syntaxes. * syntaxes.
*/ */
'store.sql.dsn' => 'sqlite:$STATE_DIRECTORY/simplesamlphp.sqlite3', 'store.sql.dsn' => $SAML_DATABASE_DSN,
/* /*
* The username and password to use when connecting to the database. * The username and password to use when connecting to the database.
*/ */
'store.sql.username' => null, 'store.sql.username' => $SAML_DATABASE_USERNAME,
'store.sql.password' => null, 'store.sql.password' => $SAML_DATABASE_PASSWORD,
/* /*
* The prefix we should use on our tables. * The prefix we should use on our tables.

1
hosts/bekkalokk/services/idp-simplesamlphp/default.nix
View File

@ -93,7 +93,6 @@ let
--replace '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=idp"' \ --replace '$SAML_DATABASE_DSN' '"pgsql:host=postgres.pvv.ntnu.no;port=5432;dbname=idp"' \
--replace '$SAML_DATABASE_USERNAME' '"idp"' \ --replace '$SAML_DATABASE_USERNAME' '"idp"' \
--replace '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."idp/postgres_password".path}")' \ --replace '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."idp/postgres_password".path}")' \
--replace '$STATE_DIRECTORY' '/var/lib/idp' \
--replace '$CACHE_DIRECTORY' '/var/cache/idp' --replace '$CACHE_DIRECTORY' '/var/cache/idp'
''; '';

1
hosts/bekkalokk/services/mediawiki/default.nix
View File

@ -26,7 +26,6 @@
--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"' \
--replace '$SAML_DATABASE_USERNAME' '"mediawiki_simplesamlphp"' \ --replace '$SAML_DATABASE_USERNAME' '"mediawiki_simplesamlphp"' \
--replace '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/postgres_password".path}")' \ --replace '$SAML_DATABASE_PASSWORD' 'file_get_contents("${config.sops.secrets."mediawiki/simplesamlphp/postgres_password".path}")' \
--replace '$STATE_DIRECTORY' '/var/lib/mediawiki' \
--replace '$CACHE_DIRECTORY' '/var/cache/mediawiki/idp' --replace '$CACHE_DIRECTORY' '/var/cache/mediawiki/idp'
''; '';
}; };

6
hosts/bekkalokk/services/mediawiki/simplesaml-config.php
View File

@ -1195,13 +1195,13 @@ $config = [
* See http://www.php.net/manual/en/pdo.drivers.php for the various * See http://www.php.net/manual/en/pdo.drivers.php for the various
* syntaxes. * syntaxes.
*/ */
'store.sql.dsn' => 'sqlite:$STATE_DIRECTORY/simplesamlphp.sqlite3', 'store.sql.dsn' => $SAML_DATABASE_DSN,
/* /*
* The username and password to use when connecting to the database. * The username and password to use when connecting to the database.
*/ */
'store.sql.username' => null, 'store.sql.username' => $SAML_DATABASE_USERNAME,
'store.sql.password' => null, 'store.sql.password' => $SAML_DATABASE_PASSWORD,
/* /*
* The prefix we should use on our tables. * The prefix we should use on our tables.