summary refs log tree commit diff
path: root/nixos/modules/services/web-apps/bookstack.nix
diff options
context:
space:
mode:
authortalyz <kim.lindberger@gmail.com>2022-01-11 13:48:13 +0100
committertalyz <kim.lindberger@gmail.com>2022-01-18 15:16:17 +0100
commita0b54a0626634b34b579e52f84464e5ab890afdd (patch)
tree4f7836df588884fc726e433857876e9ad7d8ca74 /nixos/modules/services/web-apps/bookstack.nix
parentdf607c1d1f6ea9ad5fcc99a0cabba0ede4be0d4e (diff)
downloadnixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.tar
nixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.tar.gz
nixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.tar.bz2
nixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.tar.lz
nixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.tar.xz
nixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.tar.zst
nixpkgs-a0b54a0626634b34b579e52f84464e5ab890afdd.zip
nixos/bookstack: Simplify the nginx setup
Use the recommended defaults and remove unnecessary configuration.
Diffstat (limited to 'nixos/modules/services/web-apps/bookstack.nix')
-rw-r--r--nixos/modules/services/web-apps/bookstack.nix19
1 files changed, 7 insertions, 12 deletions
diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix
index 62a04bccc66..c0eec78059b 100644
--- a/nixos/modules/services/web-apps/bookstack.nix
+++ b/nixos/modules/services/web-apps/bookstack.nix
@@ -272,24 +272,19 @@ in {
 
     services.nginx = {
       enable = mkDefault true;
+      recommendedTlsSettings = true;
+      recommendedOptimisation = true;
+      recommendedGzipSettings = true;
       virtualHosts.${cfg.hostname} = mkMerge [ cfg.nginx {
         root = mkForce "${bookstack}/public";
-        extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;";
         locations = {
           "/" = {
             index = "index.php";
-            extraConfig = ''try_files $uri $uri/ /index.php?$query_string;'';
-          };
-          "~ \.php$" = {
-            extraConfig = ''
-              try_files $uri $uri/ /index.php?$query_string;
-              include ${pkgs.nginx}/conf/fastcgi_params;
-              fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-              fastcgi_param REDIRECT_STATUS 200;
-              fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};
-              ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}
-            '';
+            tryFiles = "$uri $uri/ /index.php?$query_string";
           };
+          "~ \.php$".extraConfig = ''
+            fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};
+          '';
           "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = {
             extraConfig = "expires 365d;";
           };