-{ stdenv, fetchurl, gettext, writeText, env, awl, davical }:
+{ stdenv, fetchurl, gettext, writeText, env, awl, davical, config }:
rec {
activationScript = {
deps = [ "httpd" ];
install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/davical
'';
};
- keys = [{
- dest = "webapps/dav-davical";
+ keys."webapps/dav-davical" = {
user = apache.user;
group = apache.group;
permissions = "0400";
$c->do_not_sync_from_ldap = array('admin' => true);
include('drivers_ldap.php');
'';
- }];
- webapp = davical.override { davical_config = "/var/secrets/webapps/dav-davical"; };
+ };
+ webapp = davical.override { davical_config = config.secrets.fullPaths."webapps/dav-davical"; };
webRoot = "${webapp}/htdocs";
apache = rec {
user = "wwwrun";
group = "wwwrun";
modules = [ "proxy_fcgi" ];
- webappName = "tools_davical";
- root = "/run/current-system/webapps/${webappName}";
+ root = webRoot;
vhostConf = socket: ''
Alias /davical "${root}"
Alias /caldav.php "${root}/caldav.php"
};
phpFpm = rec {
serviceDeps = [ "postgresql.service" "openldap.service" ];
- basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ];
+ basedir = builtins.concatStringsSep ":" [ webapp config.secrets.fullPaths."webapps/dav-davical" awl ];
pool = {
"listen.owner" = apache.user;
"listen.group" = apache.group;