Merge remote-tracking branch 'mors/master' into mors-staging

2 files changed, 82 insertions, 2 deletions

diff --git a/modules/uriel/default.nix b/modules/uriel/default.nix
index bfdc02256..a54dfa7ec 100644
--- a/modules/uriel/default.nix
+++ b/modules/uriel/default.nix
@@ -16,13 +16,14 @@
     ../../secrets/uriel-pw.nix
     ../lass/sshkeys.nix
     ../lass/bird.nix
+    ./repos.nix
   ];
+
   nixpkgs = {
     url = "https://github.com/Lassulus/nixpkgs";
-    rev = "b42ecfb8c61e514bf7733b4ab0982d3e7e27dacb";
+    rev = "b74c8eeb73a75eb61148c190df4733474a99a205";
   };
 
-
   networking.hostName = "uriel";
   networking.wireless.enable = true;
   nix.maxJobs = 2;
@@ -104,6 +105,7 @@
   environment.systemPackages = with pkgs; [
   ];
 
+
   #users.extraGroups = {
   #  loot = {
   #    members = [
diff --git a/modules/uriel/repos.nix b/modules/uriel/repos.nix
new file mode 100644
index 000000000..e31ba9481
--- /dev/null
+++ b/modules/uriel/repos.nix
@@ -0,0 +1,78 @@
+{ ... }:
+
+{
+  imports = [
+    ../lass/gitolite-base.nix
+    ../common/krebs-keys.nix
+    ../common/krebs-repos.nix
+  ];
+
+  services.gitolite = {
+    repos = {
+
+      config = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+          tv = "R";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      pass = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+        };
+      };
+
+      load-env = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+          tv = "R";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      emse-hsdb = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+          tv = "R";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      brain = {
+        users = {
+          lass = "RW+";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+        #hooks.post-receive = irc-announce;
+      };
+
+      painload = {
+        users = {
+          lass = "RW+";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      services = {
+        users = {
+          lass = "RW+";
+        };
+        extraConfig = "option hook.post-receive = irc-announce";
+      };
+
+      xmonad-config = {
+        users = {
+          lass = "RW+";
+          uriel = "R";
+        };
+      };
+
+    };
+  };
+}