Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/caddy: resync with upstream unit file #78360

Merged
merged 1 commit into from Feb 13, 2020

Conversation

@yorickvP
Copy link
Contributor

@yorickvP yorickvP commented Jan 23, 2020

Motivation for this change

On ACME failure, instantly restarting Caddy will consume the rate limit within
10 seconds. Give the user a chance to resolve the failure.

Update the caddy service with some changes from upstream.

Things done
@mkaito
Copy link
Contributor

@mkaito mkaito commented Jan 23, 2020

Oh yeah. This. The reason I never upstreamed this is that the unit restart timer isn't at fault. Caddy itself retries without restarting.

@yorickvP yorickvP force-pushed the serokell:mkaito/caddy-restart branch from e5246a3 to 34b0167 Jan 23, 2020
@yorickvP yorickvP changed the title nixos/caddy: wait 5 minutes between automatic restarts nixos/caddy: resync with upstream unit file Jan 23, 2020
StartLimitInterval = 86400;
StartLimitBurst = 5;
Restart = "on-abnormal";
StartLimitIntervalSec = 14400;

This comment has been minimized.

@mkaito

mkaito Jan 23, 2020
Contributor

I have my doubts that this will help. If Caddy retries internally, how is sytemd supposed to do anything about it?

This comment has been minimized.

@yorickvP

yorickvP Jan 24, 2020
Author Contributor

It won't help our SSL issue, but it's still useful to get the defaults from upstream.

@flokli
flokli approved these changes Feb 13, 2020
@flokli flokli merged commit 7564f4f into NixOS:master Feb 13, 2020
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.