aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/isabelle
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2021-10-22 20:07:14 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2021-10-23 01:43:33 +0200
commit750fe5a43b957b91a26069cf8a4fe19fc7b2633c (patch)
tree79b4fb8d49ad7a38884e8453349635a7f715ad7e /modules/private/websites/isabelle
parentfcbdf67afe262bf6b35a4047956b2f8c12a04cb1 (diff)
downloadNix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.gz
Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.zst
Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.zip
Remove webappdirs
Diffstat (limited to 'modules/private/websites/isabelle')
-rw-r--r--modules/private/websites/isabelle/aten_integration.nix4
-rw-r--r--modules/private/websites/isabelle/aten_production.nix4
-rw-r--r--modules/private/websites/isabelle/iridologie.nix10
3 files changed, 8 insertions, 10 deletions
diff --git a/modules/private/websites/isabelle/aten_integration.nix b/modules/private/websites/isabelle/aten_integration.nix
index 899ee66..7e0aaf7 100644
--- a/modules/private/websites/isabelle/aten_integration.nix
+++ b/modules/private/websites/isabelle/aten_integration.nix
@@ -60,7 +60,7 @@ in {
60 certName = "integration"; 60 certName = "integration";
61 addToCerts = true; 61 addToCerts = true;
62 hosts = [ "dev.aten.pro" ]; 62 hosts = [ "dev.aten.pro" ];
63 root = pcfg.webappDirs.isabelle_aten_integration; 63 root = app.webRoot;
64 extraConfig = [ 64 extraConfig = [
65 '' 65 ''
66 <FilesMatch "\.php$"> 66 <FilesMatch "\.php$">
@@ -81,7 +81,7 @@ in {
81 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>" 81 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
82 </Location> 82 </Location>
83 83
84 <Directory ${pcfg.webappDirs.isabelle_aten_integration}> 84 <Directory ${app.webRoot}>
85 Options Indexes FollowSymLinks MultiViews Includes 85 Options Indexes FollowSymLinks MultiViews Includes
86 AllowOverride All 86 AllowOverride All
87 Require all granted 87 Require all granted
diff --git a/modules/private/websites/isabelle/aten_production.nix b/modules/private/websites/isabelle/aten_production.nix
index b8d12b9..6a04710 100644
--- a/modules/private/websites/isabelle/aten_production.nix
+++ b/modules/private/websites/isabelle/aten_production.nix
@@ -61,7 +61,7 @@ in {
61 certName = "isabelle"; 61 certName = "isabelle";
62 certMainHost = "aten.pro"; 62 certMainHost = "aten.pro";
63 hosts = [ "aten.pro" "www.aten.pro" ]; 63 hosts = [ "aten.pro" "www.aten.pro" ];
64 root = pcfg.webappDirs.isabelle_aten_production; 64 root = app.webRoot;
65 extraConfig = [ 65 extraConfig = [
66 '' 66 ''
67 <FilesMatch "\.php$"> 67 <FilesMatch "\.php$">
@@ -78,7 +78,7 @@ in {
78 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>" 78 ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://aten.pro\"></html>"
79 </Location> 79 </Location>
80 80
81 <Directory ${pcfg.webappDirs.isabelle_aten_production}> 81 <Directory ${app.webRoot}>
82 Options Indexes FollowSymLinks MultiViews Includes 82 Options Indexes FollowSymLinks MultiViews Includes
83 AllowOverride All 83 AllowOverride All
84 Require all granted 84 Require all granted
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index decda36..88521fc 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -10,7 +10,6 @@ let
10 10
11 apacheUser = config.services.httpd.Prod.user; 11 apacheUser = config.services.httpd.Prod.user;
12 apacheGroup = config.services.httpd.Prod.group; 12 apacheGroup = config.services.httpd.Prod.group;
13 webappdir = config.services.websites.webappDirsPaths.isabelle_iridologie;
14 secretsPath = config.secrets.fullPaths."websites/isabelle/iridologie"; 13 secretsPath = config.secrets.fullPaths."websites/isabelle/iridologie";
15in { 14in {
16 options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website"; 15 options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website";
@@ -68,13 +67,12 @@ in {
68 install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions 67 install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
69 ''; 68 '';
70 }; 69 };
71 services.websites.webappDirs.isabelle_iridologie = app.webRoot;
72 services.websites.env.production.modules = [ "proxy_fcgi" ]; 70 services.websites.env.production.modules = [ "proxy_fcgi" ];
73 services.websites.env.production.vhostConfs.isabelle_iridologie = { 71 services.websites.env.production.vhostConfs.isabelle_iridologie = {
74 certName = "isabelle"; 72 certName = "isabelle";
75 addToCerts = true; 73 addToCerts = true;
76 hosts = [ "iridologie.icommandeur.org" "icommandeur.org" "www.icommandeur.org" ]; 74 hosts = [ "iridologie.icommandeur.org" "icommandeur.org" "www.icommandeur.org" ];
77 root = webappdir; 75 root = app.webRoot;
78 extraConfig = [ 76 extraConfig = [
79 '' 77 ''
80 RewriteEngine On 78 RewriteEngine On
@@ -89,16 +87,16 @@ in {
89 SetHandler "proxy:unix:${config.services.phpfpm.pools.isabelle_iridologie.socket}|fcgi://localhost" 87 SetHandler "proxy:unix:${config.services.phpfpm.pools.isabelle_iridologie.socket}|fcgi://localhost"
90 </FilesMatch> 88 </FilesMatch>
91 89
92 <Directory ${webappdir}> 90 <Directory ${app.webRoot}>
93 DirectoryIndex index.php index.htm index.html 91 DirectoryIndex index.php index.htm index.html
94 Options -Indexes +FollowSymLinks +MultiViews +Includes 92 Options -Indexes +FollowSymLinks +MultiViews +Includes
95 Include ${webappdir}/htaccess.txt 93 Include ${app.webRoot}/htaccess.txt
96 94
97 AllowOverride AuthConfig FileInfo Limit 95 AllowOverride AuthConfig FileInfo Limit
98 Require all granted 96 Require all granted
99 </Directory> 97 </Directory>
100 98
101 <DirectoryMatch "${webappdir}/squelettes"> 99 <DirectoryMatch "${app.webRoot}/squelettes">
102 Require all denied 100 Require all denied
103 </DirectoryMatch> 101 </DirectoryMatch>
104 102
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 11:45:46 +0000