Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e79b7c45c343
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a17e021b9486
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 17, 2020

  1. nixos/acme: Fix postRun in acme certificate being ran at every run 

    (cherry picked from commit 8e88b8d)
    @immae
    immae committed Apr 17, 2020
    Copy the full SHA
    ed20edf View commit details

Commits on Apr 18, 2020

  1. maintainers: add wamserma 

    Signed-off-by: Markus S. Wamser <github-dev@mail2013.wamser.eu>
    @wamserma @bhipple
    wamserma authored and bhipple committed Apr 18, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7fcae37 View commit details

  2. Merge pull request #85366 from immae/fix_acme_postrun_20_03 

     nixos/acme: Fix postRun in acme certificate being ran at every run
    @worldofpeace
    worldofpeace authored Apr 18, 2020
    Copy the full SHA
    a17e021 View commit details
Showing with 12 additions and 1 deletion.
  1. +6 −0 maintainers/maintainer-list.nix
  2. +6 −1 nixos/modules/security/acme.nix
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -7640,6 +7640,12 @@
githubId = 3889405;
name = "vyp";
};
wamserma = {
name = "Markus S. Wamser";
email = "github-dev@mail2013.wamser.eu";
github = "wamserma";
githubId = 60148;
};
waynr = {
name = "Wayne Warren";
email = "wayne.warren.s@gmail.com";
7 changes: 6 additions & 1 deletion nixos/modules/security/acme.nix
View file
Original file line number Diff line number Diff line change
@@ -319,7 +319,9 @@ in
# Test that existing cert is older than new cert
KEY=${spath}/certificates/${keyName}.key
KEY_CHANGED=no
if [ -e $KEY -a $KEY -nt key.pem ]; then
KEY_CHANGED=yes
cp -p ${spath}/certificates/${keyName}.key key.pem
cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
@@ -330,7 +332,10 @@ in
chmod ${fileMode} *.pem
chown '${data.user}:${data.group}' *.pem
${data.postRun}
if [ "$KEY_CHANGED" = "yes" ]; then
: # noop in case postRun is empty
${data.postRun}
fi
'';
in
"+${script}";