diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-16 14:09:27 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-02-16 14:09:27 +0100 |
commit | e5073addbe397afd596613af469f3308a07c1801 (patch) | |
tree | 943148dbdbfb9aeeccf9c5a5d945a7398205f03d /nixops/modules/websites/aten/aten.nix | |
parent | a556c4b01a536afd90042dad95e7cc09f37d4056 (diff) | |
download | Nix-e5073addbe397afd596613af469f3308a07c1801.tar.gz Nix-e5073addbe397afd596613af469f3308a07c1801.tar.zst Nix-e5073addbe397afd596613af469f3308a07c1801.zip |
Move integration websites to use stable web directory
This permits to avoir having to restart httpd at each application
deployment
Diffstat (limited to 'nixops/modules/websites/aten/aten.nix')
-rw-r--r-- | nixops/modules/websites/aten/aten.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix index 1910a67..f986ec1 100644 --- a/nixops/modules/websites/aten/aten.nix +++ b/nixops/modules/websites/aten/aten.nix | |||
@@ -29,10 +29,12 @@ let | |||
29 | pm.max_spare_servers = 3 | 29 | pm.max_spare_servers = 3 |
30 | ''}''; | 30 | ''}''; |
31 | }; | 31 | }; |
32 | apache = { | 32 | apache = rec { |
33 | user = "wwwrun"; | 33 | user = "wwwrun"; |
34 | group = "wwwrun"; | 34 | group = "wwwrun"; |
35 | modules = [ "proxy_fcgi" ]; | 35 | modules = [ "proxy_fcgi" ]; |
36 | webappName = "aten_${environment}"; | ||
37 | root = "/run/current-system/webapps/${webappName}"; | ||
36 | vhostConf = '' | 38 | vhostConf = '' |
37 | <FilesMatch "\.php$"> | 39 | <FilesMatch "\.php$"> |
38 | SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" | 40 | SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" |
@@ -64,7 +66,7 @@ let | |||
64 | </Location> | 66 | </Location> |
65 | ''} | 67 | ''} |
66 | 68 | ||
67 | <Directory ${webRoot}> | 69 | <Directory ${if environment == "dev" then root else webRoot}> |
68 | Options Indexes FollowSymLinks MultiViews Includes | 70 | Options Indexes FollowSymLinks MultiViews Includes |
69 | AllowOverride All | 71 | AllowOverride All |
70 | Require all granted | 72 | Require all granted |