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

Use better defaults for installation directories (backport #1662) #1663

Merged
merged 3 commits into from
Aug 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 4, 2021

This is an automatic backport of pull request #1662 done by Mergify.
Cherry-pick of 3541c2b has failed:

On branch mergify/bp/master/pr-1662
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3541c2bdf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Changed defaults for installation locations

* SYSCONFDIR is /etc by default now
* LOCALSTATEDIR is /var by default now
* GVM_RUN_DIR is /run/gvm by default now
* OPENVAS_DEFAULT_SOCKET is /run/ospd/ospd-openvas.sock by default now
* SYSTEMD_SERVICE_DIR is /lib/systemd/system by default now

Dropped gvmd.default file and use sane defaults in generated
gvmd.service file instead. Packagers should patch that file if it
doesn't fit instead of using the gvmd.default file.

(cherry picked from commit 1ecc464)
(cherry picked from commit 3541c2b)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner August 4, 2021 15:01
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Aug 4, 2021
@bjoernricks bjoernricks merged commit 19c2a5b into master Aug 5, 2021
@bjoernricks bjoernricks deleted the mergify/bp/master/pr-1662 branch August 5, 2021 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts This backport pull request has merge conflicts that need to be resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants