Add ssl domain for git

[perso/Immae/Config/Nix.git] / virtual / eldiron.nix

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index c8536c6f044b5a5b88751498bc2cfe971fa6c2ef..49d426455c18aaca025aceef903a53009ac17ecc 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -12,7 +12,7 @@
     networking = {
       firewall = {
         enable = true;
-        allowedTCPPorts = [ 22 80 443 3306 5432 ];
+        allowedTCPPorts = [ 22 80 443 3306 5432 9418 ];
       };
     };
 
@@ -64,6 +64,7 @@
         '';
         extraDomains = {
           "db-1.immae.eu" = null;
+          "git.immae.eu" = null;
           "tools.immae.eu" = null;
           "connexionswing.immae.eu" = null;
           "sandetludo.immae.eu" = null;
@@ -93,6 +94,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 +136,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;
       };
     };
 
@@ -185,6 +196,13 @@
       source = ldap_authorized_keys;
     };
 
+    services.gitDaemon = {
+      enable = true;
+      user = "gitolite";
+      group = "gitolite";
+      basePath = "${mypkgs.git.web.varDir}/repositories";
+    };
+
     services.httpd = let
       withSSL = domain: {
         enableSSL = true;
@@ -252,6 +270,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"
@@ -305,6 +324,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
@@ -409,6 +429,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