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/tools/cloud/default.nix | |
parent | fcbdf67afe262bf6b35a4047956b2f8c12a04cb1 (diff) | |
download | Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.gz Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.zst Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.zip |
Remove webappdirs
Diffstat (limited to 'modules/private/websites/tools/cloud/default.nix')
-rw-r--r-- | modules/private/websites/tools/cloud/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index fc0aae6..44163de 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix | |||
@@ -8,8 +8,6 @@ let | |||
8 | ]); | 8 | ]); |
9 | env = config.myEnv.tools.nextcloud; | 9 | env = config.myEnv.tools.nextcloud; |
10 | varDir = "/var/lib/nextcloud"; | 10 | varDir = "/var/lib/nextcloud"; |
11 | webappName = "tools_nextcloud"; | ||
12 | apacheRoot = "/run/current-system/webapps/${webappName}"; | ||
13 | cfg = config.myServices.websites.tools.cloud; | 11 | cfg = config.myServices.websites.tools.cloud; |
14 | phpFpm = rec { | 12 | phpFpm = rec { |
15 | basedir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps); | 13 | basedir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps); |
@@ -49,11 +47,11 @@ in { | |||
49 | certName = "eldiron"; | 47 | certName = "eldiron"; |
50 | addToCerts = true; | 48 | addToCerts = true; |
51 | hosts = ["cloud.immae.eu" ]; | 49 | hosts = ["cloud.immae.eu" ]; |
52 | root = apacheRoot; | 50 | root = nextcloud; |
53 | extraConfig = [ | 51 | extraConfig = [ |
54 | '' | 52 | '' |
55 | SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 | 53 | SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 |
56 | <Directory ${apacheRoot}> | 54 | <Directory ${nextcloud}> |
57 | AcceptPathInfo On | 55 | AcceptPathInfo On |
58 | DirectoryIndex index.php | 56 | DirectoryIndex index.php |
59 | Options FollowSymlinks | 57 | Options FollowSymlinks |
@@ -159,11 +157,6 @@ in { | |||
159 | #install -D -m 0600 -o wwwrun -g wwwrun -T ${config.secrets.fullPaths."webapps/tools-nextcloud"} ${varDir}/config/config.php | 157 | #install -D -m 0600 -o wwwrun -g wwwrun -T ${config.secrets.fullPaths."webapps/tools-nextcloud"} ${varDir}/config/config.php |
160 | ''; | 158 | ''; |
161 | }; | 159 | }; |
162 | # FIXME: add a warning when config.php changes | ||
163 | system.extraSystemBuilderCmds = '' | ||
164 | mkdir -p $out/webapps | ||
165 | ln -s ${nextcloud} $out/webapps/${webappName} | ||
166 | ''; | ||
167 | 160 | ||
168 | services.phpfpm.pools.nextcloud = { | 161 | services.phpfpm.pools.nextcloud = { |
169 | user = "wwwrun"; | 162 | user = "wwwrun"; |