diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-16 23:23:05 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-17 00:04:47 +0200 |
commit | 7df420c27ebe7daaa4fd099c457ce9a9075b840e (patch) | |
tree | ec41e01e9331652c09dc4f2ed4186ce5952c3882 /nixops/modules/websites/ftp/leila.nix | |
parent | 52f45eb051df228955add90ca62de66a7ed8af34 (diff) | |
download | Nix-7df420c27ebe7daaa4fd099c457ce9a9075b840e.tar.gz Nix-7df420c27ebe7daaa4fd099c457ce9a9075b840e.tar.zst Nix-7df420c27ebe7daaa4fd099c457ce9a9075b840e.zip |
Add certificate creation and handling to websites
Diffstat (limited to 'nixops/modules/websites/ftp/leila.nix')
-rw-r--r-- | nixops/modules/websites/ftp/leila.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/nixops/modules/websites/ftp/leila.nix b/nixops/modules/websites/ftp/leila.nix index 5185372..14bfa20 100644 --- a/nixops/modules/websites/ftp/leila.nix +++ b/nixops/modules/websites/ftp/leila.nix | |||
@@ -10,15 +10,6 @@ in { | |||
10 | }; | 10 | }; |
11 | 11 | ||
12 | config = (lib.mkIf cfg.production.enable { | 12 | config = (lib.mkIf cfg.production.enable { |
13 | security.acme.certs."leila" = config.services.myCertificates.certConfig // { | ||
14 | domain = "leila.bouya.org"; | ||
15 | extraDomains = { | ||
16 | "chorale.leila.bouya.org" = null; | ||
17 | "chorale-vocanta.fr.nf" = null; | ||
18 | "www.chorale-vocanta.fr.nf" = null; | ||
19 | }; | ||
20 | }; | ||
21 | |||
22 | services.myPhpfpm.poolConfigs.leila = '' | 13 | services.myPhpfpm.poolConfigs.leila = '' |
23 | listen = /run/phpfpm/leila.sock | 14 | listen = /run/phpfpm/leila.sock |
24 | user = wwwrun | 15 | user = wwwrun |
@@ -41,6 +32,7 @@ in { | |||
41 | services.websites.production.modules = [ "proxy_fcgi" ]; | 32 | services.websites.production.modules = [ "proxy_fcgi" ]; |
42 | services.websites.production.vhostConfs.leila_chorale = { | 33 | services.websites.production.vhostConfs.leila_chorale = { |
43 | certName = "leila"; | 34 | certName = "leila"; |
35 | addToCerts = true; | ||
44 | hosts = [ "chorale.leila.bouya.org" "chorale-vocanta.fr.nf" "www.chorale-vocanta.fr.nf" ]; | 36 | hosts = [ "chorale.leila.bouya.org" "chorale-vocanta.fr.nf" "www.chorale-vocanta.fr.nf" ]; |
45 | root = "${varDir}/Chorale"; | 37 | root = "${varDir}/Chorale"; |
46 | extraConfig = [ | 38 | extraConfig = [ |
@@ -62,10 +54,11 @@ in { | |||
62 | ]; | 54 | ]; |
63 | }; | 55 | }; |
64 | services.websites.production.vhostConfs.leila = { | 56 | services.websites.production.vhostConfs.leila = { |
65 | certName = "leila"; | 57 | certName = "leila"; |
66 | hosts = [ "leila.bouya.org" ]; | 58 | certMainHost = "leila.bouya.org"; |
67 | root = varDir; | 59 | hosts = [ "leila.bouya.org" ]; |
68 | extraConfig = [ | 60 | root = varDir; |
61 | extraConfig = [ | ||
69 | '' | 62 | '' |
70 | Use Stats leila.bouya.org | 63 | Use Stats leila.bouya.org |
71 | <Directory ${varDir}/Chorale> | 64 | <Directory ${varDir}/Chorale> |