diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-22 20:07:14 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-23 01:43:33 +0200 |
commit | 750fe5a43b957b91a26069cf8a4fe19fc7b2633c (patch) | |
tree | 79b4fb8d49ad7a38884e8453349635a7f715ad7e /modules/private/websites/richie/production.nix | |
parent | fcbdf67afe262bf6b35a4047956b2f8c12a04cb1 (diff) | |
download | Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.gz Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.zst Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.zip |
Remove webappdirs
Diffstat (limited to 'modules/private/websites/richie/production.nix')
-rw-r--r-- | modules/private/websites/richie/production.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/private/websites/richie/production.nix b/modules/private/websites/richie/production.nix index 3efa9f0..e95df30 100644 --- a/modules/private/websites/richie/production.nix +++ b/modules/private/websites/richie/production.nix | |||
@@ -17,7 +17,6 @@ let | |||
17 | sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php | 17 | sed -i "s@localedef --list-archive@localedef --list-archive /run/current-system/sw/lib/locale/locale-archive@" $out/admin/parametres.php |
18 | ''; | 18 | ''; |
19 | }; | 19 | }; |
20 | webappdir = config.services.websites.webappDirsPaths.richie_production; | ||
21 | secretPath = config.secrets.fullPaths."websites/richie/production"; | 20 | secretPath = config.secrets.fullPaths."websites/richie/production"; |
22 | apacheUser = config.services.httpd.Prod.user; | 21 | apacheUser = config.services.httpd.Prod.user; |
23 | apacheGroup = config.services.httpd.Prod.group; | 22 | apacheGroup = config.services.httpd.Prod.group; |
@@ -48,7 +47,6 @@ in | |||
48 | ?> | 47 | ?> |
49 | ''; | 48 | ''; |
50 | }; | 49 | }; |
51 | services.websites.webappDirs.richie_production = richieSrc; | ||
52 | system.activationScripts.richie_production = { | 50 | system.activationScripts.richie_production = { |
53 | deps = [ "httpd" ]; | 51 | deps = [ "httpd" ]; |
54 | text = '' | 52 | text = '' |
@@ -85,7 +83,7 @@ in | |||
85 | addToCerts = true; | 83 | addToCerts = true; |
86 | certMainHost = "europe-richie.org"; | 84 | certMainHost = "europe-richie.org"; |
87 | hosts = [ "europe-richie.org" "www.europe-richie.org" ]; | 85 | hosts = [ "europe-richie.org" "www.europe-richie.org" ]; |
88 | root = webappdir; | 86 | root = richieSrc; |
89 | extraConfig = [ | 87 | extraConfig = [ |
90 | '' | 88 | '' |
91 | Use Stats europe-richie.org | 89 | Use Stats europe-richie.org |
@@ -93,7 +91,7 @@ in | |||
93 | <LocationMatch "^/files/.*/admin/"> | 91 | <LocationMatch "^/files/.*/admin/"> |
94 | Require all denied | 92 | Require all denied |
95 | </LocationMatch> | 93 | </LocationMatch> |
96 | <Directory ${webappdir}> | 94 | <Directory ${richieSrc}> |
97 | DirectoryIndex index.php index.htm index.html | 95 | DirectoryIndex index.php index.htm index.html |
98 | Options Indexes FollowSymLinks MultiViews Includes | 96 | Options Indexes FollowSymLinks MultiViews Includes |
99 | AllowOverride None | 97 | AllowOverride None |