diff options
Diffstat (limited to 'modules/private/websites/tools/git')
-rw-r--r-- | modules/private/websites/tools/git/default.nix | 1 | ||||
-rw-r--r-- | modules/private/websites/tools/git/mantisbt.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix index 8b1afa8..755bab0 100644 --- a/modules/private/websites/tools/git/default.nix +++ b/modules/private/websites/tools/git/default.nix | |||
@@ -3,6 +3,7 @@ let | |||
3 | mantisbt = pkgs.callPackage ./mantisbt.nix { | 3 | mantisbt = pkgs.callPackage ./mantisbt.nix { |
4 | inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins; | 4 | inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins; |
5 | env = config.myEnv.tools.mantisbt; | 5 | env = config.myEnv.tools.mantisbt; |
6 | inherit config; | ||
6 | }; | 7 | }; |
7 | gitweb = pkgs.callPackage ./gitweb.nix { | 8 | gitweb = pkgs.callPackage ./gitweb.nix { |
8 | gitoliteDir = config.myServices.gitolite.gitoliteDir; | 9 | gitoliteDir = config.myServices.gitolite.gitoliteDir; |
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix index 9996d23..e6a8da7 100644 --- a/modules/private/websites/tools/git/mantisbt.nix +++ b/modules/private/websites/tools/git/mantisbt.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { env, mantisbt_2, mantisbt_2-plugins }: | 1 | { env, mantisbt_2, mantisbt_2-plugins, config }: |
2 | rec { | 2 | rec { |
3 | activationScript = { | 3 | activationScript = { |
4 | deps = [ "httpd" ]; | 4 | deps = [ "httpd" ]; |
@@ -46,7 +46,7 @@ rec { | |||
46 | $g_ldap_organization = '${env.ldap.filter}'; | 46 | $g_ldap_organization = '${env.ldap.filter}'; |
47 | ''; | 47 | ''; |
48 | }]; | 48 | }]; |
49 | webRoot = (mantisbt_2.override { mantis_config = "/var/secrets/webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration]); | 49 | webRoot = (mantisbt_2.override { mantis_config = config.secrets.fullPaths."webapps/tools-mantisbt"; }).withPlugins (p: [p.slack p.source-integration]); |
50 | apache = rec { | 50 | apache = rec { |
51 | user = "wwwrun"; | 51 | user = "wwwrun"; |
52 | group = "wwwrun"; | 52 | group = "wwwrun"; |
@@ -75,7 +75,7 @@ rec { | |||
75 | phpFpm = rec { | 75 | phpFpm = rec { |
76 | serviceDeps = [ "postgresql.service" "openldap.service" ]; | 76 | serviceDeps = [ "postgresql.service" "openldap.service" ]; |
77 | basedir = builtins.concatStringsSep ":" ( | 77 | basedir = builtins.concatStringsSep ":" ( |
78 | [ webRoot "/var/secrets/webapps/tools-mantisbt" ] | 78 | [ webRoot config.secrets.fullPaths."webapps/tools-mantisbt" ] |
79 | ++ webRoot.plugins); | 79 | ++ webRoot.plugins); |
80 | pool = { | 80 | pool = { |
81 | "listen.owner" = apache.user; | 81 | "listen.owner" = apache.user; |