-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
mantisbt = pkgs.callPackage ./mantisbt.nix {
inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins;
- env = myconfig.env.tools.mantisbt;
+ env = config.myEnv.tools.mantisbt;
};
gitweb = pkgs.callPackage ./gitweb.nix {
gitoliteDir = config.myServices.gitolite.gitoliteDir;
config = lib.mkIf cfg.enable {
secrets.keys = mantisbt.keys;
- services.websites.tools.modules =
+ services.websites.env.tools.modules =
gitweb.apache.modules ++
mantisbt.apache.modules;
myServices.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot;
myServices.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot;
system.activationScripts.mantisbt = mantisbt.activationScript;
- services.websites.tools.vhostConfs.git = {
+ services.websites.env.tools.vhostConfs.git = {
certName = "eldiron";
addToCerts = true;
hosts = ["git.immae.eu" ];
root = gitweb.apache.root;
extraConfig = [
gitweb.apache.vhostConf
- mantisbt.apache.vhostConf
+ (mantisbt.apache.vhostConf config.services.phpfpm.pools.mantisbt.socket)
''
RewriteEngine on
RewriteCond %{REQUEST_URI} ^/releases
''
];
};
- services.phpfpm.poolConfigs = {
- mantisbt = mantisbt.phpFpm.pool;
+ services.phpfpm.pools = {
+ mantisbt = {
+ user = config.services.httpd.Tools.user;
+ group = config.services.httpd.Tools.group;
+ settings = mantisbt.phpFpm.pool;
+ };
};
};
}