summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/nginx
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-03-29 11:17:55 +0200
committerlassulus <lassulus@lassul.us>2018-03-29 11:17:55 +0200
commit1589a668023312ad6d0a24abb4caefe76ea95bac (patch)
tree5165721158e632af1b2a8081e0be52cae944f429 /makefu/2configs/nginx
parent22f33b8e99cf9ffe575905370df736ddc3517338 (diff)
parent10bcf2db927692818a948c755fdfbf961a2ac3d7 (diff)
Merge remote-tracking branch 'gum/master' into staging/18.03
Diffstat (limited to 'makefu/2configs/nginx')
-rw-r--r--makefu/2configs/nginx/euer.wiki.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 08bc5659f..99533b25c 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -17,6 +17,7 @@ let
# contains:
# user1 = pass1
# userN = passN
+ # afterwards put /var/www/<ext-dom>/user1.html as tiddlywiki
tw-pass-file = "${sec}/tw-pass.ini";
in {
@@ -45,7 +46,7 @@ in {
systemd.services.prepare-tw = {
wantedBy = [ "local-fs.target" ];
- before = [ "phpfpm.service" ];
+ before = [ "phpfpm.service" "nginx.service" ];
serviceConfig = {
ExecStart = pkgs.writeScript "prepare-tw-service" ''
#!/bin/sh
@@ -92,6 +93,7 @@ in {
locations = {
"/" = {
root = wiki-dir;
+ index = "makefu.html";
extraConfig = ''
expires -1;
autoindex on;