git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75294 from kampka/postgres-service-refactor

matrix-synapse: Use postgres service to create database and user

commit226ea5c17a4980500aaf9576dd7fad15fb72a101 authorLéo Gaspard <leo@gaspard.io> dateSat 14 Dec 2019, 21:36 (7 years ago) parent7d94455b2d67c0
1 file changed+9−22
nixos/modules/services/misc/matrix-synapse.nix+9−22
nixos/modules/services/misc/matrix-synapse.nix+9−22
@@ -671,43 +671,30 @@ in {
671671 gid = config.ids.gids.matrix-synapse;
672672 } ];
673673
674− services.postgresql.enable = mkIf usePostgresql (mkDefault true);
674+ services.postgresql = mkIf (usePostgresql && cfg.create_local_database) {
675+ enable = mkDefault true;
676+ ensureDatabases = [ cfg.database_name ];
677+ ensureUsers = [{
678+ name = cfg.database_user;
679+ ensurePermissions = { "DATABASE \"${cfg.database_name}\"" = "ALL PRIVILEGES"; };
680+ }];
681+ };
675682
676683 systemd.services.matrix-synapse = {
677684 description = "Synapse Matrix homeserver";
678− after = [ "network.target" "postgresql.service" ];
685+ after = [ "network.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service" ;
679686 wantedBy = [ "multi-user.target" ];
680687 preStart = ''
681688 ${cfg.package}/bin/homeserver \
682689 --config-path ${configFile} \
683690 --keys-directory ${cfg.dataDir} \
684691 --generate-keys
685− '' + optionalString (usePostgresql && cfg.create_local_database) ''
686− if ! test -e "${cfg.dataDir}/db-created"; then
687− ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
688− ${pg.package}/bin/createuser \
689− --login \
690− --no-createdb \
691− --no-createrole \
692− --encrypted \
693− ${cfg.database_user}
694− ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
695− ${pg.package}/bin/createdb \
696− --owner=${cfg.database_user} \
697− --encoding=UTF8 \
698− --lc-collate=C \
699− --lc-ctype=C \
700− --template=template0 \
701− ${cfg.database_name}
702− touch "${cfg.dataDir}/db-created"
703− fi
704692 '';
705693 serviceConfig = {
706694 Type = "notify";
707695 User = "matrix-synapse";
708696 Group = "matrix-synapse";
709697 WorkingDirectory = cfg.dataDir;
710− PermissionsStartOnly = true;
711698 ExecStart = ''
712699 ${cfg.package}/bin/homeserver \
713700 ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }