aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/emilia
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/modules/websites/emilia')
-rw-r--r--nixops/modules/websites/emilia/default.nix16
1 files changed, 5 insertions, 11 deletions
diff --git a/nixops/modules/websites/emilia/default.nix b/nixops/modules/websites/emilia/default.nix
index 4e32bec..47257b7 100644
--- a/nixops/modules/websites/emilia/default.nix
+++ b/nixops/modules/websites/emilia/default.nix
@@ -47,13 +47,6 @@ in {
47 }; 47 };
48 48
49 config = lib.mkIf cfg.production.enable { 49 config = lib.mkIf cfg.production.enable {
50 security.acme.certs."emilia" = config.services.myCertificates.certConfig // {
51 domain = "saison-photo.org";
52 extraDomains = {
53 "www.saison-photo.org" = null;
54 };
55 };
56
57 system.activationScripts.emilia = '' 50 system.activationScripts.emilia = ''
58 install -m 0755 -o wwwrun -g wwwrun -d ${varDir} 51 install -m 0755 -o wwwrun -g wwwrun -d ${varDir}
59 ''; 52 '';
@@ -62,10 +55,11 @@ in {
62 ln -s ${siteDir} $out/webapps/${webappName} 55 ln -s ${siteDir} $out/webapps/${webappName}
63 ''; 56 '';
64 services.websites.production.vhostConfs.emilia = { 57 services.websites.production.vhostConfs.emilia = {
65 certName = "emilia"; 58 certName = "emilia";
66 hosts = [ "saison-photo.org" "www.saison-photo.org" ]; 59 certMainHost = "saison-photo.org";
67 root = root; 60 hosts = [ "saison-photo.org" "www.saison-photo.org" ];
68 extraConfig = [ 61 root = root;
62 extraConfig = [
69 '' 63 ''
70 <Directory ${root}> 64 <Directory ${root}>
71 DirectoryIndex pause.html 65 DirectoryIndex pause.html