Commit d37a03eb authored by Bert Proesmans's avatar Bert Proesmans
Browse files

nixos/windmill: Fix database setup config 

Postgresql db-init procedure changed with a separate unit for initialisation.
This commit makes the windmill configuration conformant again.
parent e7270b6c

nixos/modules/services/web-apps/windmill.nix

+73 −35
Original line number Diff line number Diff line
@@ -91,6 +91,16 @@ in 


  config = lib.mkIf cfg.enable {



    assertions = [

      {

        assertion = cfg.database.createLocally -> cfg.database.name == cfg.database.user;

        message = ''

          Automatically provisioning the windmill database requires both database name and database user to be equal. '${cfg.database.name}' != '${cfg.database.user}'

          To fix this problem, assign the same value to both options services.windmill.database.{name,user}.

        '';

      }

    ];



    services.postgresql = lib.optionalAttrs (cfg.database.createLocally) {

      enable = lib.mkDefault true;
@@ -101,7 +111,6 @@ in 
          ensureDBOwnership = true;

        }

      ];



    };



    systemd.services =
@@ -112,7 +121,6 @@ in 
          # using the same user to simplify db connection

          User = cfg.database.user;

          ExecStart = "${pkgs.windmill}/bin/windmill";



          Restart = "always";

        }

        // lib.optionalAttrs useUrlPath {
@@ -129,11 +137,30 @@ in 
          };

      in

      {

        windmill-initdb = lib.mkIf cfg.database.createLocally {

          description = "Windmill database setup";

          requires = [ "postgresql.target" ];

          after = [ "postgresql.target" ];

          requiredBy =

            [ ]

            ++ (lib.optionals config.systemd.services.windmill-server.enable [ "windmill-server.service" ])

            ++ (lib.optionals config.systemd.services.windmill-worker.enable [ "windmill-worker.service" ])

            ++ (lib.optionals config.systemd.services.windmill-worker-native.enable [

              "windmill-worker-native.service"

            ]);

          before =

            [ ]

            ++ (lib.optionals config.systemd.services.windmill-server.enable [ "windmill-server.service" ])

            ++ (lib.optionals config.systemd.services.windmill-worker.enable [ "windmill-worker.service" ])

            ++ (lib.optionals config.systemd.services.windmill-worker-native.enable [

              "windmill-worker-native.service"

            ]);



          path = [ config.services.postgresql.package ];

          # coming from https://github.com/windmill-labs/windmill/blob/main/init-db-as-superuser.sql

          # modified to not grant privileges on all tables

          # create role windmill_user and windmill_admin only if they don't exist

        postgresql.postStart = lib.mkIf cfg.database.createLocally ''

          script = ''

            psql -tA <<"EOF"

              DO $$

              BEGIN
@@ -155,15 +182,26 @@ in 
                  ELSE

                    RAISE NOTICE 'Role "windmill_admin" already exists. Skipping.';

                  END IF;

              GRANT windmill_admin TO windmill;

                  GRANT windmill_admin TO ${cfg.database.user};

              END

              $$;

            EOF

          '';



          serviceConfig = {

            Type = "oneshot";

            RemainAfterExit = true;

            # Superuser because of required permission CREATE ROLE

            User = "postgres";



            ProtectSystem = "strict";

            ProtectHome = "read-only";

          };

        };



        windmill-server = {

          description = "Windmill server";

          after = [ "network.target" ] ++ lib.optional cfg.database.createLocally "postgresql.target";

          after = [ "network.target" ];

          wantedBy = [ "multi-user.target" ];



          serviceConfig = serviceConfig // {
@@ -181,7 +219,7 @@ in 


        windmill-worker = {

          description = "Windmill worker";

          after = [ "network.target" ] ++ lib.optional cfg.database.createLocally "postgresql.target";

          after = [ "network.target" ];

          wantedBy = [ "multi-user.target" ];



          serviceConfig = serviceConfig // {
@@ -200,7 +238,7 @@ in 


        windmill-worker-native = {

          description = "Windmill worker native";

          after = [ "network.target" ] ++ lib.optional cfg.database.createLocally "postgresql.target";

          after = [ "network.target" ];

          wantedBy = [ "multi-user.target" ];



          serviceConfig = serviceConfig // {