aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites/tools/tools/shaarli.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-25 09:26:26 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-25 09:26:26 +0200
commit8db8e666707a0e51af9353c76c5863e1a5482ed5 (patch)
tree64bfdc2cb62f84250955424ad202fc875d4ddbc4 /nixops/modules/websites/tools/tools/shaarli.nix
parent32c84ff89c2b8931f58cea63961a178a9b1d0efe (diff)
downloadNix-8db8e666707a0e51af9353c76c5863e1a5482ed5.tar.gz
Nix-8db8e666707a0e51af9353c76c5863e1a5482ed5.tar.zst
Nix-8db8e666707a0e51af9353c76c5863e1a5482ed5.zip
Move tools to new secrets location
Diffstat (limited to 'nixops/modules/websites/tools/tools/shaarli.nix')
-rw-r--r--nixops/modules/websites/tools/tools/shaarli.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixops/modules/websites/tools/tools/shaarli.nix b/nixops/modules/websites/tools/tools/shaarli.nix
index 56658fd..19b27c2 100644
--- a/nixops/modules/websites/tools/tools/shaarli.nix
+++ b/nixops/modules/websites/tools/tools/shaarli.nix
@@ -49,7 +49,7 @@ in rec {
49 vhostConf = '' 49 vhostConf = ''
50 Alias /Shaarli "${root}" 50 Alias /Shaarli "${root}"
51 51
52 Include /run/keys/webapps/tools-shaarli 52 Include /var/secrets/webapps/tools-shaarli
53 <Directory "${root}"> 53 <Directory "${root}">
54 DirectoryIndex index.php index.htm index.html 54 DirectoryIndex index.php index.htm index.html
55 Options Indexes FollowSymLinks MultiViews Includes 55 Options Indexes FollowSymLinks MultiViews Includes
@@ -61,8 +61,8 @@ in rec {
61 </Directory> 61 </Directory>
62 ''; 62 '';
63 }; 63 };
64 keys.tools-shaarli = { 64 keys = [{
65 destDir = "/run/keys/webapps"; 65 dest = "webapps/tools-shaarli";
66 user = apache.user; 66 user = apache.user;
67 group = apache.group; 67 group = apache.group;
68 permissions = "0400"; 68 permissions = "0400";
@@ -73,7 +73,7 @@ in rec {
73 SetEnv SHAARLI_LDAP_BASE "${env.ldap.base}" 73 SetEnv SHAARLI_LDAP_BASE "${env.ldap.base}"
74 SetEnv SHAARLI_LDAP_FILTER "${env.ldap.search}" 74 SetEnv SHAARLI_LDAP_FILTER "${env.ldap.search}"
75 ''; 75 '';
76 }; 76 }];
77 phpFpm = rec { 77 phpFpm = rec {
78 serviceDeps = [ "openldap.service" ]; 78 serviceDeps = [ "openldap.service" ];
79 basedir = builtins.concatStringsSep ":" [ webRoot varDir ]; 79 basedir = builtins.concatStringsSep ":" [ webRoot varDir ];