about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-02-26 00:48:53 +0100
committerGitHub <noreply@github.com>2020-02-26 00:48:53 +0100
commit5f37069888e11cf8ff4649867d5d4b463271d8a6 (patch)
treea1dfeb8f9f221fa2fc819a435bed937d830b95c6 /nixos
parent26277c18fbe259b7480455350f284b6571ed61ed (diff)
parent8ecbd97f82997063192cd97188422b93b90b95ca (diff)
downloadnixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.tar
nixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.tar.gz
nixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.tar.bz2
nixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.tar.lz
nixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.tar.xz
nixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.tar.zst
nixlib-5f37069888e11cf8ff4649867d5d4b463271d8a6.zip
Merge pull request #80861 from emilazy/acme-fullchain
nixos/acme: move the crt to fullchain.pem
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/security/acme.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 7da6666f79c6..238c18242c19 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -325,10 +325,10 @@ in
                           KEY=${spath}/certificates/${keyName}.key
                           if [ -e $KEY -a $KEY -nt key.pem ]; then
                             cp -p ${spath}/certificates/${keyName}.key key.pem
-                            cp -p ${spath}/certificates/${keyName}.crt cert.pem
+                            cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
                             cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
-                            cat cert.pem chain.pem > fullchain.pem
-                            cat key.pem cert.pem chain.pem > full.pem
+                            ln -s fullchain.pem cert.pem
+                            cat key.pem fullchain.pem > full.pem
                             chmod ${rights} *.pem
                             chown '${data.user}:${data.group}' *.pem
                           fi