diff options
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r-- | virtual/eldiron.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index fb366b7..56c6afd 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -49,6 +49,8 @@ | |||
49 | extraDomains = { | 49 | extraDomains = { |
50 | "db-1.immae.eu" = null; | 50 | "db-1.immae.eu" = null; |
51 | "tools.immae.eu" = null; | 51 | "tools.immae.eu" = null; |
52 | "connexionswing.immae.eu" = null; | ||
53 | "sandetludo.immae.eu" = null; | ||
52 | }; | 54 | }; |
53 | }; | 55 | }; |
54 | }; | 56 | }; |
@@ -62,6 +64,7 @@ | |||
62 | ''; | 64 | ''; |
63 | poolConfigs = { | 65 | poolConfigs = { |
64 | adminer = mypkgs.adminer.phpFpm.pool; | 66 | adminer = mypkgs.adminer.phpFpm.pool; |
67 | connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool; | ||
65 | www = '' | 68 | www = '' |
66 | listen = /var/run/phpfpm/www.sock | 69 | listen = /var/run/phpfpm/www.sock |
67 | user = wwwrun | 70 | user = wwwrun |
@@ -77,6 +80,10 @@ | |||
77 | }; | 80 | }; |
78 | }; | 81 | }; |
79 | 82 | ||
83 | system.activationScripts = { | ||
84 | connexionswing_dev = mypkgs.connexionswing_dev.activationScript; | ||
85 | }; | ||
86 | |||
80 | services.httpd = let | 87 | services.httpd = let |
81 | withSSL = domain: { | 88 | withSSL = domain: { |
82 | enableSSL = true; | 89 | enableSSL = true; |
@@ -92,6 +99,7 @@ | |||
92 | # FIXME: http2 | 99 | # FIXME: http2 |
93 | extraModules = pkgs.lib.lists.unique ( | 100 | extraModules = pkgs.lib.lists.unique ( |
94 | mypkgs.adminer.apache.modules ++ | 101 | mypkgs.adminer.apache.modules ++ |
102 | mypkgs.connexionswing_dev.apache.modules ++ | ||
95 | [ | 103 | [ |
96 | "macro" | 104 | "macro" |
97 | "ldap" | 105 | "ldap" |
@@ -141,6 +149,15 @@ | |||
141 | mypkgs.ympd.apache.vhostConf | 149 | mypkgs.ympd.apache.vhostConf |
142 | ]; | 150 | ]; |
143 | }) | 151 | }) |
152 | (withSSL "eldiron" // { | ||
153 | listen = [ { ip = "*"; port = 443; } ]; | ||
154 | hostName = "connexionswing.immae.eu"; | ||
155 | serverAliases = [ "sandetludo.immae.eu" ]; | ||
156 | documentRoot = mypkgs.connexionswing_dev.webRoot; | ||
157 | extraConfig = builtins.concatStringsSep "\n" [ | ||
158 | mypkgs.connexionswing_dev.apache.vhostConf | ||
159 | ]; | ||
160 | }) | ||
144 | { # Should go last, default fallback | 161 | { # Should go last, default fallback |
145 | listen = [ { ip = "*"; port = 80; } ]; | 162 | listen = [ { ip = "*"; port = 80; } ]; |
146 | hostName = "redirectSSL"; | 163 | hostName = "redirectSSL"; |