Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5fbab6dabbc8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 996ae856b6d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 17, 2020

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

    @immae
    immae committed Apr 17, 2020
    Copy the full SHA
    8e88b8d View commit details

Commits on Apr 18, 2020

  1. Merge pull request #85365 from immae/fix_acme_postrun 

     nixos/acme: Fix postRun in acme certificate being ran at every run
    @worldofpeace
    worldofpeace authored Apr 18, 2020
    Copy the full SHA
    996ae85 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 nixos/modules/security/acme.nix
7 changes: 6 additions & 1 deletion nixos/modules/security/acme.nix
View file
Original file line number Diff line number Diff line change
@@ -343,7 +343,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
@@ -354,7 +356,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}";