X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;h=39672b515ad932090420d8fcc188d16c89f621ee;hb=6d1919342a40b37bc2c664f364bd03a4faec7ef4;hp=f70c92c8c6bd61886884f7fe48755cc204ae79ae;hpb=7611e4e2ace4355ec4397a675883890927a13c7c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index f70c92c..39672b5 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -93,6 +93,15 @@
 
     users.users.wwwrun.extraGroups = [ "gitolite" ];
 
+    users.users.gitolite.packages = let
+      python-packages = python-packages: with python-packages; [
+        simplejson
+        urllib3
+      ];
+    in
+      [
+        (pkgs.python3.withPackages python-packages)
+      ];
     # FIXME: after initial install, need to
     # (1) copy rc file (adjust gitolite_ldap_groups.sh)
     # (2) (mark old readonly and) sync repos except gitolite-admin
@@ -126,6 +135,7 @@
         connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool;
         connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool;
         nextcloud = mypkgs.nextcloud.phpFpm.pool;
+        mantisbt = mypkgs.mantisbt.phpFpm.pool;
       };
     };
 
@@ -259,6 +269,7 @@
         mypkgs.connexionswing_prod.apache.modules ++
         mypkgs.ympd.apache.modules ++
         mypkgs.git.web.apache.modules ++
+        mypkgs.mantisbt.apache.modules ++
         pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++
         [ "macro" ]);
       extraConfig = builtins.concatStringsSep "\n"
@@ -312,6 +323,7 @@
           documentRoot = mypkgs.git.web.webRoot;
           extraConfig = builtins.concatStringsSep "\n" [
             mypkgs.git.web.apache.vhostConf
+            mypkgs.mantisbt.apache.vhostConf
           ] + ''
             RewriteEngine on
             RewriteCond %{REQUEST_URI}       ^/releases
@@ -416,6 +428,7 @@
       authentication = ''
         local	all	postgres				ident
         local	all	all					md5
+        host	all	all		samehost		md5
         host	all	all		178.33.252.96/32	md5
         host	all	all		188.165.209.148/32	md5
         #host	all	all		all			pam