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

Merge master into staging-next

parents a86d1125 15fcb26b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16120,7 +16120,7 @@
    name = "Robert Walter";
  };
  roconnor = {
    email = "roconnor@theorem.ca";
    email = "roconnor@r6.ca";
    github = "roconnor";
    githubId = 852967;
    name = "Russell O'Connor";
+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
  release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and
  [v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes.

- The `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200).

- `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block.
  Example:

+1 −4
Original line number Diff line number Diff line
@@ -299,10 +299,7 @@ in
        fi
      '' + optionalString (cfg.database.passwordFile != null) ''
        # create a copy of the supplied password file in a format zabbix can consume
        touch ${passwordFile}
        chmod 0600 ${passwordFile}
        echo -n "DBPassword = " > ${passwordFile}
        cat ${cfg.database.passwordFile} >> ${passwordFile}
        install -m 0600 <(echo "DBPassword = $(cat ${cfg.database.passwordFile})") ${passwordFile}
      '';

      serviceConfig = {
+1 −4
Original line number Diff line number Diff line
@@ -292,10 +292,7 @@ in
        fi
      '' + optionalString (cfg.database.passwordFile != null) ''
        # create a copy of the supplied password file in a format zabbix can consume
        touch ${passwordFile}
        chmod 0600 ${passwordFile}
        echo -n "DBPassword = " > ${passwordFile}
        cat ${cfg.database.passwordFile} >> ${passwordFile}
        install -m 0600 <(echo "DBPassword = $(cat ${cfg.database.passwordFile})") ${passwordFile}
      '';

      serviceConfig = {
+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ in
          };
          "/" = {
            # mixed frontend and backend requests, based on the request headers
            proxyPass = "$proxpass";
            recommendedProxySettings = true;
            extraConfig = ''
              set $proxpass "${ui}";
@@ -220,6 +219,8 @@ in

              # Cuts off the trailing slash on URLs to make them valid
              rewrite ^(.+)/+$ $1 permanent;

              proxy_pass $proxpass;
            '';
          };
        };
Loading