summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-24 09:46:28 +0200
committerlassulus <lass@aidsballs.de>2016-10-24 09:46:28 +0200
commitb43f47f0b30618e810c7c2c2b186acdbeaed73d6 (patch)
tree16441373bc51cfc4b6d5ee475703e39e1f8eb2f5
parentaf206b48225abdaa6596d4974bfaf112c5fff5ab (diff)
parent08c7671fc51270e582e16cbe49aa896f8bff7685 (diff)
Merge remote-tracking branch 'cd/master'
-rw-r--r--krebs/3modules/git.nix6
-rw-r--r--krebs/5pkgs/populate/default.nix4
-rw-r--r--tv/2configs/default.nix10
-rw-r--r--tv/2configs/git.nix7
4 files changed, 23 insertions, 4 deletions
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index e6b98a923..20907a3ed 100644
--- a/krebs/3modules/git.nix
+++ b/krebs/3modules/git.nix
@@ -389,6 +389,12 @@ let
mapAttrsToList repo-to-cgitrc cfg.repos
));
+ environment.systemPackages = [
+ (pkgs.writeDashBin "cgit-clear-cache" ''
+ ${pkgs.coreutils}/bin/rm -f ${cfg.cgit.settings.cache-root}/*
+ '')
+ ];
+
system.activationScripts.cgit = ''
mkdir -m 0700 -p ${cfg.cgit.settings.cache-root}
chown ${toString cfg.cgit.fcgiwrap.user.uid}:${toString cfg.cgit.fcgiwrap.group.gid} ${cfg.cgit.settings.cache-root}
diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix
index 09b29c6c3..dc5750bda 100644
--- a/krebs/5pkgs/populate/default.nix
+++ b/krebs/5pkgs/populate/default.nix
@@ -13,12 +13,12 @@ in
stdenv.mkDerivation rec {
name = "populate";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchgit {
url = http://cgit.cd.krebsco.de/populate;
rev = "refs/tags/v${version}";
- sha256 = "139f4lzn56lca3qgqy9g33r94m3xi1mqns9340lkb4qm6626yvqd";
+ sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07";
};
phases = [
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 475c17f2f..39d0c4f6b 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "cd41bfeeb1aaa10e4d412f2bd90dc2844a7c5df8";
+ ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
@@ -112,6 +112,14 @@ with import <stockholm/lib>;
};
}
+ (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in {
+ environment.variables = {
+ CURL_CA_BUNDLE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+ GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+ SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
+ };
+ })
+
{
services.cron.enable = false;
services.nscd.enable = false;
diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix
index 21d365381..d937be2c4 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -34,9 +34,14 @@ let
load-env = {};
make-snapshot = {};
much = {};
+ netcup = {
+ cgit.desc = "netcup command line interface";
+ };
newsbot-js = {};
nixpkgs = {};
- populate.desc = "source code installer";
+ populate = {
+ cgit.desc = "source code installer";
+ };
push = {};
regfish = {};
soundcloud = {