Unverified Commit 09f18b89 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 0adbf526 fe370c25
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -16331,6 +16331,12 @@
    githubId = 29493551;
    name = "Josh Peters";
  };
  petertriho = {
    email = "mail@petertriho.com";
    github = "petertriho";
    githubId = 7420227;
    name = "Peter Tri Ho";
  };
  peterwilli = {
    email = "peter@codebuffet.co";
    github = "peterwilli";
+4 −3
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ For an upgrade, a script like this can be used to simplify the process:
      newPostgres = pkgs.postgresql_13.withPackages (pp: [
        # pp.plv8
      ]);
      cfg = config.services.postgresql;
    in pkgs.writeScriptBin "upgrade-pg-cluster" ''
      set -eux
      # XXX it's perhaps advisable to stop all services that depend on postgresql
@@ -205,12 +206,12 @@ For an upgrade, a script like this can be used to simplify the process:

      export NEWBIN="${newPostgres}/bin"

      export OLDDATA="${config.services.postgresql.dataDir}"
      export OLDBIN="${config.services.postgresql.package}/bin"
      export OLDDATA="${cfg.dataDir}"
      export OLDBIN="${cfg.package}/bin"

      install -d -m 0700 -o postgres -g postgres "$NEWDATA"
      cd "$NEWDATA"
      sudo -u postgres $NEWBIN/initdb -D "$NEWDATA"
      sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${builtins.concatStringsSep " " cfg.initdbArgs}

      sudo -u postgres $NEWBIN/pg_upgrade \
        --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ let
            (l: warn "setting this option with a list is deprecated"
              listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l))
            (attrsOf path);
          default = { inherit (pkgs.wordpressPackages.themes) twentytwentythree; };
          defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentythree; }";
          default = { inherit (pkgs.wordpressPackages.themes) twentytwentyfour; };
          defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentyfour; }";
          description = ''
            Path(s) to respective theme(s) which are copied from the 'theme' directory.

+176 −176

File changed.

Preview size limit exceeded, changes collapsed.

+188 −185

File changed.

Preview size limit exceeded, changes collapsed.

Loading