Skip to content
This repository has been archived by the owner on Nov 29, 2021. It is now read-only.

Use better defaults for file paths and permissions (backport #429) #430

Merged
merged 4 commits into from
Aug 12, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 1, 2021

This is an automatic backport of pull request #429 done by Mergify.
Cherry-pick of 352d01e has failed:

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

You are currently cherry-picking commit 352d01e.
  (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://help.github.com/articles/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/

* /var/run is just a symlink to /run nowadays.
* Allow user and group to access to socket by default. This allows for
  querying data from osp in a multi-user setup more easily.
* Move pid file within /run/ospd
* There is no /usr/var directory by default. Therefore change the path
  to the certs to something that makes sense

(cherry picked from commit 64571cb)
(cherry picked from commit 352d01e)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 1, 2021 10:51
@mergify mergify bot added the conflicts label Jul 1, 2021
@codecov
Copy link

codecov bot commented Jul 1, 2021

Codecov Report

Merging #430 (71f08ad) into master (3a511bd) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #430   +/-   ##
=======================================
  Coverage   75.28%   75.28%           
=======================================
  Files          23       23           
  Lines        2670     2670           
=======================================
  Hits         2010     2010           
  Misses        660      660           
Impacted Files Coverage Δ
ospd/parser.py 91.66% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3a511bd...71f08ad. Read the comment docs.

@jjnicola
Copy link
Member

@Mergifyio update

@mergify
Copy link
Author

mergify bot commented Aug 12, 2021

Command update: success

Branch already up to date

@jjnicola jjnicola enabled auto-merge August 12, 2021 09:21
@jjnicola jjnicola merged commit 2c8daf0 into master Aug 12, 2021
@jjnicola jjnicola deleted the mergify/bp/master/pr-429 branch August 12, 2021 09:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants