Merge branch 'master' into staging

2016-02-17 10:06:31 +01:00
parent ee994dfae6 2f3eae3a87
commit e9520e81b3
456 changed files with 22536 additions and 2438 deletions
@@ -56,8 +56,8 @@ let

      plugins = mkOption {
        type = types.listOf (types.enum [
-          "cert.der" "cert.pem" "chain.der" "chain.pem" "external_pem.sh"
-          "fullchain.der" "fullchain.pem" "key.der" "key.pem" "account_key.json"
+          "cert.der" "cert.pem" "chain.pem" "external_pem.sh"
+          "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json"
        ]);
        default = [ "fullchain.pem" "key.pem" "account_key.json" ];
        description = ''