(maint) Merge 7.x into main #2823
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
As part of a recent change in clojars, it is necessary for the license to be part of the exported pom file. Puppetserver has been under the apache-2 license for ~12 years, so this isn't anything new. This adds the declaration to the project.clj so that leiningen will correctly add the license to the exported pom file.
…license-to-project-clj (maint) add license to project.clj
(maint) Update gems to match what is shipped in platform
By default when Puppet creates a user the password is recorded as having
a sentinel value of an exclamation mark. This special value prevents
users from logging in via password - though the root user can still `su`
to it locally - and by default SSHD will not allow access to these
"locked" accounts.
Most of our acceptance VMs specially configure SSHD to allow access to
these "locked" accounts, but not our newer Almalinux VMs.
By giving the git user an explicit password we can connect via SSH to
the git user, regardless of the SSHD configuration on the VM. The star
("*") used for the git user's password is also a special sentinel value
which prevents logging into the user via password, but will not be
considered "locked" by SSHD.
For reference see:
https://unix.stackexchange.com/questions/193066/how-to-unlock-account-for-public-key-ssh-authorization-but-not-for-password-aut
Resolved conflicts by taking values in main Conflicts: - acceptance/config/beaker/options.rb - resources/ext/build-scripts/jruby-gem-list.txt - ruby/puppet
|
Sooo... what I've done here is terrible. I've removed eastwood linting. I also created this PR #2825 to see if anything within my merge up was causing it and it doesn't seem to be. Then I went (in linked PR) and reverted back to a PR merge commit that passed lein-eastwood and it still failed. I should note, that lein-eastwood works fine for me locally. eastwood 1.2.2, eastwood 1.4.2, with lein 2.11.2, or lein 2.9.1, or lein 2.10.0, on HEAD of this PR, or HEAD of the linked PR, or HEAD of main (after resolving the tk-metric conflict). All works locally, none of it works in GH PR testing. And I'm done trying to debug GH PR testing. |
donoghuc
approved these changes
Feb 16, 2024
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.
Resolved conflicts by taking values in main
Conflicts: