-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
infcloud = rec {
webappName = "tools_infcloud";
'';
};
davical = pkgs.callPackage ./davical.nix {
- env = myconfig.env.tools.davical;
+ env = config.myEnv.tools.davical;
inherit (pkgs.webapps) davical awl;
};
config = lib.mkIf cfg.enable {
system.activationScripts.davical = davical.activationScript;
secrets.keys = davical.keys;
- services.websites.tools.modules = davical.apache.modules;
+ services.websites.env.tools.modules = davical.apache.modules;
- services.websites.tools.vhostConfs.dav = {
+ services.websites.env.tools.vhostConfs.dav = {
certName = "eldiron";
addToCerts = true;
hosts = ["dav.immae.eu" ];
- root = null;
+ root = "/run/current-system/webapps/_dav";
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;
+ services.websites.webappDirs._dav = ./www;
+ services.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
+ services.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
};
}