This repository was archived by the owner on Mar 8, 2023. It is now read-only.
backmerge for release 6.0.4 #290
Merged
Conversation
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
* Fixes that weren't properly merged - The `wsgi.py` link is no longer needed since one was made in `config.pp`. So that code is no longer necessary. This block wasn't merged in. - Removing subscription to `$local_settings_py_file`. It is not defined when `config_gunicorn.pp` is evaluated. As it turns out, it can be safely removed. * New variable means WorkingDirectory doesn't need /graphite on the end * Only run race condition fix after initial db creation It used to `exec` on every run, now it won't. * Only bump systemd on install * Add service provider definition for Debian-based OSs Debian 8 was not starting carbon-cache because it didn't know it had to reload the systemd definitions. So I coded in a params for it, like was done for redhat-based OSs. This allowed for simplified logic in `config.pp`. * Adding provider to gunicorn service Ubuntu 15.10 has some weird race condition or something, where the service would sometimes start and sometimes not. Explicitly specifying the service provider seems to have no such error. * Set RedHat service provider based on OS version Rather than blanketing everything with RedHat and using OS version checks, I have coded in what the `service_provider` should be. * Adding rspec for config_gunicorn and updating the others * Fix for float vs string problem
Use proper dependencies for race condition fix
…ge[python-ldap] for Package[carbon]
Remove extra dollar sign from pid_file to fix restart on RedHat systems
In order to avoid ==> default: Error: Could not find dependency Packa…
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
No description provided.