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/connexionswing | |
| 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/connexionswing')
| -rw-r--r-- | nixops/modules/websites/connexionswing/connexionswing.nix | 6 | ||||
| -rw-r--r-- | nixops/modules/websites/connexionswing/default.nix | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/nixops/modules/websites/connexionswing/connexionswing.nix b/nixops/modules/websites/connexionswing/connexionswing.nix index 307def0..dff563f 100644 --- a/nixops/modules/websites/connexionswing/connexionswing.nix +++ b/nixops/modules/websites/connexionswing/connexionswing.nix | |||
| @@ -56,10 +56,12 @@ let | |||
| 56 | pm.max_spare_servers = 3 | 56 | pm.max_spare_servers = 3 |
| 57 | ''}''; | 57 | ''}''; |
| 58 | }; | 58 | }; |
| 59 | apache = { | 59 | apache = rec { |
| 60 | user = "wwwrun"; | 60 | user = "wwwrun"; |
| 61 | group = "wwwrun"; | 61 | group = "wwwrun"; |
| 62 | modules = [ "proxy_fcgi" ]; | 62 | modules = [ "proxy_fcgi" ]; |
| 63 | webappName = "connexionswing_${environment}"; | ||
| 64 | root = "/run/current-system/webapps/${webappName}"; | ||
| 63 | vhostConf = '' | 65 | vhostConf = '' |
| 64 | <FilesMatch "\.php$"> | 66 | <FilesMatch "\.php$"> |
| 65 | SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" | 67 | SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" |
| @@ -84,7 +86,7 @@ let | |||
| 84 | ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>" | 86 | ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>" |
| 85 | </Location> | 87 | </Location> |
| 86 | 88 | ||
| 87 | <Directory ${webRoot}> | 89 | <Directory ${root}> |
| 88 | Options Indexes FollowSymLinks MultiViews Includes | 90 | Options Indexes FollowSymLinks MultiViews Includes |
| 89 | AllowOverride None | 91 | AllowOverride None |
| 90 | Require all granted | 92 | Require all granted |
diff --git a/nixops/modules/websites/connexionswing/default.nix b/nixops/modules/websites/connexionswing/default.nix index 5ce3525..f176762 100644 --- a/nixops/modules/websites/connexionswing/default.nix +++ b/nixops/modules/websites/connexionswing/default.nix | |||
| @@ -45,6 +45,10 @@ in { | |||
| 45 | services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; | 45 | services.myPhpfpm.poolConfigs.connexionswing_prod = connexionswing_prod.phpFpm.pool; |
| 46 | services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; | 46 | services.myPhpfpm.poolPhpConfigs.connexionswing_prod = connexionswing_prod.phpFpm.phpConfig; |
| 47 | system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; | 47 | system.activationScripts.connexionswing_prod = connexionswing_prod.activationScript; |
| 48 | system.extraSystemBuilderCmds = '' | ||
| 49 | mkdir -p $out/webapps | ||
| 50 | ln -s ${connexionswing_prod.webRoot} $out/webapps/${connexionswing_prod.apache.webappName} | ||
| 51 | ''; | ||
| 48 | services.myWebsites.production.modules = connexionswing_prod.apache.modules; | 52 | services.myWebsites.production.modules = connexionswing_prod.apache.modules; |
| 49 | services.myWebsites.production.vhostConfs.connexionswing = { | 53 | services.myWebsites.production.vhostConfs.connexionswing = { |
| 50 | certName = "connexionswing"; | 54 | certName = "connexionswing"; |
| @@ -59,11 +63,15 @@ in { | |||
| 59 | services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; | 63 | services.myPhpfpm.poolConfigs.connexionswing_dev = connexionswing_dev.phpFpm.pool; |
| 60 | services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; | 64 | services.myPhpfpm.poolPhpConfigs.connexionswing_dev = connexionswing_dev.phpFpm.phpConfig; |
| 61 | system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; | 65 | system.activationScripts.connexionswing_dev = connexionswing_dev.activationScript; |
| 66 | system.extraSystemBuilderCmds = '' | ||
| 67 | mkdir -p $out/webapps | ||
| 68 | ln -s ${connexionswing_dev.webRoot} $out/webapps/${connexionswing_dev.apache.webappName} | ||
| 69 | ''; | ||
| 62 | services.myWebsites.integration.modules = connexionswing_dev.apache.modules; | 70 | services.myWebsites.integration.modules = connexionswing_dev.apache.modules; |
| 63 | services.myWebsites.integration.vhostConfs.connexionswing = { | 71 | services.myWebsites.integration.vhostConfs.connexionswing = { |
| 64 | certName = "eldiron"; | 72 | certName = "eldiron"; |
| 65 | hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; | 73 | hosts = ["connexionswing.immae.eu" "sandetludo.immae.eu" ]; |
| 66 | root = connexionswing_dev.webRoot; | 74 | root = connexionswing_dev.apache.root; |
| 67 | extraConfig = [ connexionswing_dev.apache.vhostConf ]; | 75 | extraConfig = [ connexionswing_dev.apache.vhostConf ]; |
| 68 | }; | 76 | }; |
| 69 | }) | 77 | }) |