-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
infcloud = rec {
- webappName = "tools_infcloud";
- root = "/run/current-system/webapps/${webappName}";
+ root = pkgs.webapps.infcloud;
vhostConf = ''
Alias /carddavmate ${root}
Alias /caldavzap ${root}
'';
};
davical = pkgs.callPackage ./davical.nix {
- env = myconfig.env.tools.davical;
+ env = config.myEnv.tools.davical;
inherit (pkgs.webapps) davical awl;
+ inherit config;
};
cfg = config.myServices.websites.tools.dav;
certName = "eldiron";
addToCerts = true;
hosts = ["dav.immae.eu" ];
- root = null;
+ root = ./www;
extraConfig = [
infcloud.vhostConf
- davical.apache.vhostConf
+ (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket)
];
};
- services.phpfpm.poolConfigs = {
- davical = davical.phpFpm.pool;
+ services.phpfpm.pools = {
+ davical = {
+ user = config.services.httpd.Tools.user;
+ group = config.services.httpd.Tools.group;
+ settings = davical.phpFpm.pool;
+ phpPackage = pkgs.php72;
+ };
};
-
- myServices.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
- myServices.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
};
}