public-inbox: add coderepos

diff --git a/servers/mermet/public-inbox.nix b/servers/mermet/public-inbox.nix
index d000d70cc3bc0a39e605c4194e93c480335607f3..df3ec56c76adf71363700639a864bd25286009fd 100644 (file)
--- a/servers/mermet/public-inbox.nix
+++ b/servers/mermet/public-inbox.nix
@@ -3,6 +3,9 @@ let inherit (config.users) groups;
     domain = "sourcephile.fr";
 in
 {
+systemd.services.public-inbox-httpd = {
+  serviceConfig.SupplementaryGroups = [ groups."git-daemon".name ];
+};
 services.public-inbox = {
   enable = true;
   path = with pkgs; [ /*spamassassin*/ ];
@@ -10,9 +13,6 @@ services.public-inbox = {
   mda.spamCheck = null;
   watch.spamCheck = null;
 
-  #config.publicinbox.css =
-  #  [ "href=https://${domain}/lists/public-inbox.css" ];
-
   http.mounts = [
     "https://mails.${domain}/inbox"
     "https://public-inbox.${domain}/inbox"
@@ -39,6 +39,10 @@ services.public-inbox = {
       '';
       url = "https://mails.${domain}/inbox/atelier";
       newsgroup = "inbox.comp.sourcephile.atelier";
+      config.coderepo = [
+        "sourcephile-txt"
+        # TODO: list many source code repositories
+      ];
     };
     bar = {
       address = [
@@ -76,6 +80,7 @@ services.public-inbox = {
       '';
       url = "https://mails.${domain}/inbox/ecole";
       newsgroup = "inbox.comp.sourcephile.ecole";
+      config.coderepo = [ "sourcephile-txt" ];
     };
     environnement = {
       address = [
@@ -88,6 +93,7 @@ services.public-inbox = {
       '';
       url = "https://mails.${domain}/inbox/environnement";
       newsgroup = "inbox.comp.sourcephile.environnement";
+      config.coderepo = [ "sourcephile-txt" ];
     };
     labo = {
       address = [
@@ -100,6 +106,10 @@ services.public-inbox = {
       '';
       url = "https://mails.${domain}/inbox/labo";
       newsgroup = "inbox.comp.sourcephile.labo";
+      config.coderepo = [
+        "sourcephile-txt"
+        # TODO: list many source code repositories
+      ];
     };
     machines = {
       address = [
@@ -112,6 +122,7 @@ services.public-inbox = {
       '';
       url = "https://mails.${domain}/inbox/machines";
       newsgroup = "inbox.comp.sourcephile.machines";
+      config.coderepo = [ "sourcephile-txt" "sourcephile-nix" ];
     };
     pont = {
       address = [
@@ -124,7 +135,7 @@ services.public-inbox = {
       '';
       url = "https://mails.${domain}/inbox/pont";
       newsgroup = "inbox.comp.sourcephile.pont";
-      #config.coderepo = [ "sourcephile" ];
+      config.coderepo = [ "sourcephile-txt" ];
     };
     test = {
       address = [
@@ -143,12 +154,16 @@ services.public-inbox = {
     };
   };
 
-  /*
-  config.coderepo.sourcephile-nix = {
-    dir = "/var/lib/git/repositories/sourcephile.git";
-    cgitUrl = "https://${domain}/git/sourcephile";
+  config.coderepo = {
+    sourcephile-txt = {
+      dir = "/var/lib/gitolite/repositories/sourcephile-txt.git";
+      cgitUrl = "https://code.${domain}/sourcephile-txt.git";
+    };
+    sourcephile-nix = {
+      dir = "/var/lib/gitolite/repositories/sourcephile-nix.git";
+      cgitUrl = "https://code.${domain}/sourcephile-nix.git";
+    };
   };
-  */
 };
 security.acme.certs."${domain}" = {
   postRun = "systemctl reload public-inbox-nntp";