X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fshaarli.nix;h=b7126cc018441d1f47291c7ff30988ec60d7e76f;hb=4c4652aabf2cb3ac8b40f2856eca07a1df9c27e0;hp=24b4845480ec2aab69b089caa8017d1f606202b2;hpb=f7c27d313296485fd5f6d76a9264c26beef2eeaa;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix
index 24b4845..b7126cc 100644
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -1,4 +1,4 @@
-{ lib, env, stdenv, fetchurl, shaarli }:
+{ lib, env, stdenv, fetchurl, shaarli, config }:
let
varDir = "/var/lib/shaarli";
in rec {
@@ -21,7 +21,12 @@ in rec {
vhostConf = socket: ''
Alias /Shaarli "${root}"
- Include /var/secrets/webapps/tools-shaarli
+ Include ${config.secrets.fullPaths."webapps/tools-shaarli"}
+
+ Header set Access-Control-Allow-Origin "*"
+ Header set Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
+ Header set Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept, Authorization, Client-Security-Token, Accept-Encoding"
+
DirectoryIndex index.php index.htm index.html
Options Indexes FollowSymLinks MultiViews Includes
@@ -33,8 +38,7 @@ in rec {
'';
};
- keys = [{
- dest = "webapps/tools-shaarli";
+ keys."webapps/tools-shaarli" = {
user = apache.user;
group = apache.group;
permissions = "0400";
@@ -45,7 +49,7 @@ in rec {
SetEnv SHAARLI_LDAP_BASE "${env.ldap.base}"
SetEnv SHAARLI_LDAP_FILTER "${env.ldap.filter}"
'';
- }];
+ };
phpFpm = rec {
serviceDeps = [ "openldap.service" ];
basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
@@ -60,6 +64,8 @@ in rec {
"php_value[session.name]" = "ShaarliPHPSESSID";
"php_admin_value[open_basedir]" = "${basedir}:/tmp";
"php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+ "php_admin_value[upload_max_filesize]" = "200M";
+ "php_admin_value[post_max_size]" = "200M";
};
};
}