merge zfs-backup branch#1486
Open
sophiebsw wants to merge 64 commits into
Open
Conversation
This reverts commit be1b32c.
timestamp file on source is empty
vcsrepo 2.3.0 doesn't support Puppet 7
strings containing variables need to be double quoted
rekt, variable not inside brackets
This should have been in commit 4d98030
* fix(mirrors): reload nginx when certs change Previously, nginx was not picking up renewed certs. * refactor(mirrors): move+use variable for ocfstats password Some history: the variable was introduced in #169 when stat tracking was added, but #925 changed the implementation and didn't use the variable any more (probably because it was so far away from where it was used). This commit moves it next to where it is used now.
Co-authored-by: rmxu <rmxu@ocf.berkeley.edu>
The people removed were notified last semester, kmo requested an extension to the end of that semester, so that was done.
* fix: don't redirect on ocf.b.e * fix: it's actually here, see if it works * fix: it works * fix: remove server cors not necessary * fix: wrong one
* Add slidingsync.matrix to load balancer * Add sliding sync to matrix/client well-known
fix SSL config to support TLS 1.2, update cipher list
* feat: smart monitoring
This reverts commit a2035a1.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
idfk man
this has been running on hal for a while so it's probably safe to merge