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

Changed defaults for installation locations (backport #826) #827

Merged
merged 3 commits into from
Aug 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 5, 2021

This is an automatic backport of pull request #826 done by Mergify.
Cherry-pick of 661c372 has failed:

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

You are currently cherry-picking commit 661c372c.
  (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/

* SYSCONFDIR is /etc by default now
* LOCALSTATEDIR is /var by default now
* OPENVAS_RUN_DIR is /run/ospd by default now
* OPENVAS_FEED_LOOK_PATH is /var/lib/openvas/feed-update.lock by default
  now

/run/ospd is used because normally openvas is started from ospd-openvas
which by default uses the /run/ospd path in the systemd service file.
This ensures that the directory for the OPENVAS_RUN_DIR exists at
runtime.

/var/lib/openvas/feed-update.lock is used because the sync scripts may
be started when the services are stopped an /run/ospd (or an other
directory in /run) is not available anymore.

(cherry picked from commit adc9fec)
(cherry picked from commit 661c372)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner August 5, 2021 06:21
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Aug 5, 2021
@bjoernricks bjoernricks merged commit 142cd7c into master Aug 5, 2021
@bjoernricks bjoernricks deleted the mergify/bp/master/pr-826 branch August 5, 2021 08:27
@cfi-gb cfi-gb mentioned this pull request Aug 31, 2021
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