Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dnsdist 1.5 support + updated test framework #27

Merged
merged 10 commits into from
Sep 17, 2020

Conversation

nvaatstra
Copy link
Contributor

Includes:

  • xgin's PR 25 to add 1.5 repo support
  • Backwards compatibility changes regarding user & group ownership, to handle dnsdist 1.5 default user changes
  • Updates to the test setup (newer Ansible versions, newer Python version, updated travis and more recent OS flavors versions

@@ -1,6 +1,4 @@
[Service]
{% for k, v in dnsdist_service_overrides.items() %}
{% if k == 'ExecStart' %}ExecStart=
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

afaik, systemd requires and empty ExecStart to clear the full value. Otherwise it appends. See man systemd.unit

Note that for drop-in files, if one wants to remove entries from a setting that is parsed as a list (and is not a dependency), such as AssertPathExists= (or e.g. ExecStart= in service units), one needs to first clear the list before re-adding all entries except the one that is to be removed. Dependencies (After=, etc.) cannot be reset to an empty list, so dependencies can only be added in drop-ins. If you want to remove dependencies, you have to override the entire unit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's correct and needs to be added back.

It also seems like we need the same thing to be done for the ExecStartPre to avoid that from being triggered multiple times with potentially incorrect parameters.

@nvaatstra
Copy link
Contributor Author

nvaatstra commented Sep 16, 2020

Both ExecStart & ExecStartPre are now reset if they have an override:

    --- before
    +++ after: /Users/nico/.ansible/tmp/ansible-local-94717z3z152l4/tmpinfnuwf9/override-service.systemd.conf.j2
    @@ -0,0 +1,8 @@
    +[Service]
    +LimitCORE=infinity
    +User=nico
    +Group=nico
    +ExecStart=
    +ExecStart=/usr/bin/dnsdist --supervised --disable-syslog
    +ExecStartPre=
    +ExecStartPre=/usr/bin/dnsdist --check-config

@nvaatstra nvaatstra merged commit 96c6e90 into PowerDNS:master Sep 17, 2020
@nvaatstra nvaatstra deleted the dnsdist-15 branch September 17, 2020 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants