Commit b3e8dae7 authored by emilylange's avatar emilylange Committed by Jörg Thalheim
Browse files

nixos/forgejo: remove `postgresql_15` permission work-around 

This is no longer necessary as of
ccfe07c3.

Previously: b8585a11.
parent a350ac03

nixos/modules/services/misc/forgejo.nix

+0 −11
Original line number Diff line number Diff line
@@ -436,17 +436,6 @@ in 
      ];

    };



    # Work around 'pq: permission denied for schema public' with postgres v15, until a

    # solution for `services.postgresql.ensureUsers` is found.

    # See https://github.com/NixOS/nixpkgs/issues/216989

    systemd.services.postgresql.postStart = lib.mkIf (

      usePostgresql

      && cfg.database.createDatabase

      && lib.strings.versionAtLeast config.services.postgresql.package.version "15.0"

    ) (lib.mkAfter ''

      $PSQL -tAc 'ALTER DATABASE "${cfg.database.name}" OWNER TO "${cfg.database.user}";'

    '');



    services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) {

      enable = mkDefault true;

      package = mkDefault pkgs.mariadb;