Skip to content

Merge develop branch into master (Backend) - #1253

Merged
matsduf merged 47 commits into
masterfrom
develop
Jun 29, 2026
Merged

Merge develop branch into master (Backend)#1253
matsduf merged 47 commits into
masterfrom
develop

Conversation

@matsduf

@matsduf matsduf commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Purpose

This PR is step https://github.com/zonemaster/zonemaster/blob/develop/docs/internal/maintenance/ReleaseProcess-release.md#15-merge-develop-branch-into-master

How to test this PR

"No reviewer or approval is required for this update."

matsduf and others added 30 commits December 19, 2025 15:55
Merge pull request #1232 from zonemaster/develop
The latest version of Perl is now 5.42. Let’s bump the topmost version
in the list of Perls tested against in CI to that.
Co-authored-by: Marc van der Wal <103426270+marc-vanderwal@users.noreply.github.com>
Co-authored-by: Marc van der Wal <103426270+marc-vanderwal@users.noreply.github.com>
Output testagent log on stdout/stderr.
Co-authored-by: tgreenx <96772376+tgreenx@users.noreply.github.com>
Changes to the cache file format in Zonemaster::Engine require
regeneration of some data files in use by the test suite in
Zonemaster-Backend.

There also was a small mistake in the logic that decides whether to
save or restore data from the corresponding data files. Restoration
should not be attempted if ZONEMASTER_RECORD=1 is not set in the
environment, and likewise, the data files should not be written to if
that same variable isn’t in the environment.
* Link to public doc site instead of github master branch
* Report startup errors as strings, not JSON-RPC objects
* Avoid premature database connection check
* Put Perl version first
* Clean up redundant strict pragmas
Make the RPCAPI constructor not build its own dependencies, allowing
the caller to access the database handle before providing it to the
RPCAPI constructor.
mattias-p and others added 17 commits June 11, 2026 11:40
* Let systemd take care of daemonization.

  Invoke zonemaster_backend_testagent with `foreground` instead of
  `start`/`stop`, --pidfile and --outfile. This allows journald to
  capture the output from STDOUT/STDERR.

* Let journald collect logs.

  Setting --logfile=- causes logs to be written to STDOUT, which is
  captured by journald.

* Let systemd take care of privilege dropping.

  By specifying User=zonemaster and Group=zonemaster,
  zonemaster_backend_testagent can execute entirely without root
  privileges.
* Let systemd take care of daemonization.

  Invoke zonemaster_backend_rpcapi.psgi without --daemonize and --pid.
  This allows journald to capture STDOUT/STDERR.

* Let journald collect logs.

  Since journald already captures STDOUT/STDERR we can just write our
  logs there.

* Let systemd take care of privilege dropping.

  By setting User= and Group= in the unit file, instead invoking
  zonemaster_backend_rpcapi.psgi with --user and --group, the process
  can be started without elevated privileges.
* Fix help text
* Add forgotten dependency
* Add documentation and unit test for Zonemaster::Backend::Log
* Clean up unit test
Co-authored-by: Marc van der Wal <103426270+marc-vanderwal@users.noreply.github.com>
Updates for release v2026.1 (Backend)
@matsduf matsduf added this to the v2026.1 milestone Jun 29, 2026
@matsduf matsduf added P-High Priority: Issue to be solved before other RC-None Release category: Not to be included in Changes file. labels Jun 29, 2026
@matsduf
matsduf merged commit 59393e7 into master Jun 29, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

P-High Priority: Issue to be solved before other RC-None Release category: Not to be included in Changes file.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants