summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* k 3 tinc_graphs: use new tinc-hostsmakefu2016-02-111-1/+1
* Merge remote-tracking branch 'cd/master'makefu2016-02-111-13/+16
|\
| * krebs.retiolum: make hostsPackage configurabletv2016-02-111-13/+16
* | Merge remote-tracking branch 'cd/master'makefu2016-02-11204-2138/+1410
|\|
| * cac-api: PATH += gnugrep (how could this ever pass full-tests?! :D)tv2016-02-111-1/+2
| * tv x220: rm AccepMethod snatv2016-02-111-3/+0
| * tv x220: remove unused stufftv2016-02-111-13/+0
| * *: turn 5pkgs into a(n optional) moduletv2016-02-118-86/+85
| * krebs.nixpkgs.allowUnfreePredicate: inittv2016-02-104-2/+46
| * krebs.backup: admit plan.startAttv2016-02-081-2/+1
| * tv git: bump descstv2016-02-081-5/+5
| * tv.iptables: inline startScript and use SyslogIdentifiertv2016-02-081-11/+7
| * Merge remote-tracking branch 'cloudkrebs/master'tv2016-02-0831-84/+816
| |\
| | * l 2 xserver: add pulseaudio to xserver depslassulus2016-02-061-0/+1
| | * l 2 browsers: don't import per-user.nixlassulus2016-02-061-2/+0
| | * l 2 base: require pkgs.proot for stockholmlassulus2016-02-061-0/+1
| | * l 2 base: krebs.source adapt to api changelassulus2016-02-061-12/+12
| | * l 1 mors: pkgs.cac -> pkgs.cac-apilassulus2016-02-061-1/+1
| | * Merge remote-tracking branch 'cd/master'lassulus2016-02-06198-2585/+881
| | |\
| | * | l 1 dishfire: import git.nixlassulus2016-02-011-0/+1
| | * | k 3 l: add ssh host key for dishfirelassulus2016-02-011-2/+2
| | * | l 1 helios: import git.nixlassulus2016-02-011-0/+1
| | * | l: add fritz websites to dishfirelassulus2016-02-012-0/+34
| | * | l 3 *_nginx: allow configuration of ssllassulus2016-02-013-5/+97
| | * | l 2 xserver: copy default.nix from tvlassulus2016-02-011-3/+4
| | * | l 2 newsbot-js: disable truther feedlassulus2016-02-011-1/+1
| | * | l 2 websites wohnprojekt: add laura userlassulus2016-02-011-0/+6
| | * | l 2 buildbot-sta..: change name to buildbot-lasslassulus2016-02-011-1/+1
| | * | l 1 mors: update nginx testslassulus2016-02-011-36/+55
| | * | l: add helios as new systemlassulus2016-02-013-0/+113
| | * | l 2: give helios & uriel more accesslassulus2016-02-012-4/+5
| | * | l 1 mors: remove redundant retiolum importlassulus2016-02-011-1/+0
| | * | k 3 l: declare pubkeys inlinelassulus2016-02-013-5/+3
| | * | k 3 l: remove dead hostslassulus2016-02-011-16/+0
| | * | Merge remote-tracking branch 'gum/master'lassulus2016-02-0117-32/+231
| | |\ \
| | * \ \ Merge remote-tracking branch 'cd/master'lassulus2016-02-0119-92/+425
| | |\ \ \
| | * | | | l 2 bitcoin: add sudo configlassulus2016-01-191-1/+6
| | * | | | Merge remote-tracking branch 'cd/master'lassulus2016-01-176-20/+30
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'gum/master'lassulus2016-01-1716-43/+188
| | |\ \ \ \ \
| | * | | | | | l 1 mors: activate buildbotlassulus2016-01-171-0/+1
| | * | | | | | l 2 git: add miefda to allowed userslassulus2016-01-171-1/+1
| | * | | | | | l 2 base: CVE-2016-0778 workaroundlassulus2016-01-171-0/+6
| | * | | | | | l 2 base: nixpkgs rev 93d8671 -> d0e3ccalassulus2016-01-171-1/+1
| | * | | | | | l 1 uriel: activate skypelassulus2016-01-171-0/+1
| | * | | | | | Merge remote-tracking branch 'gum/master'lassulus2016-01-1012-105/+267
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'cd/master'lassulus2016-01-104-36/+33
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'bobby/master'lassulus2015-12-300-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'prism/master'miefda2015-12-3062-761/+1611
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | Merge remote-tracking branch 'bobby/master'lassulus2015-12-3010-0/+329
| | |\| | | | | | | | | | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | mi 2 git: bobby now verbosemiefda2015-12-301-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 20:11:37 +0000