Merge latest upstream changes #45
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Limit ansible version range in `>=2.10.0,<6`
Newer versions of `ansible.builtin.git` puts error message in `msg` instead of `stderr`.
Fix ansible incompatibility with `Failed connection to remote repo`
Stop old process(es) before starting a new one. Fixes roots#1394 Signed-off-by: Rob Record <[email protected]>
Stop old php-fpm services before starting new one
Set max journal log file size
Use new `requirements.yml` format
Fix shared folder permissions
Fixes roots#1393 Importing `cli` from `__main__` no longer works as of ansible 2.13.1 This import is no longer used anyway so the fix is to remove it.
Fix Ansible 6 support - remove broken and unused cli import
# Conflicts: # galaxy.yml # group_vars/all/main.yml
Closed
cmurtagh
approved these changes
Jul 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge latest upstream changes from roots/trellis