summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tv pkgs.ff: drop sudotv2016-07-232-13/+3
* tv pkgs.cr: %@ -> $@tv2016-07-231-1/+1
* tv xserver: inherit (config.krebs.build) usertv2016-07-231-2/+1
* tv git: allow all users to fetch public repostv2016-07-231-1/+1
* Merge remote-tracking branch 'prism/master'tv2016-07-2245-387/+395
|\
| * l 2 git: (re)move some repo-sync reposlassulus2016-07-211-2/+1
| * l 2 downloading: remove folderPermissionslassulus2016-07-211-14/+0
| * l 2: move domes mail stuff to 2/websiteslassulus2016-07-212-9/+35
| * l 2 nixpkgs: 11a7899 -> c6ca9c8lassulus2016-07-211-1/+1
| * m 2 zsh-user: use gpg-agent 2.1 style daemonmakefu2016-07-211-9/+5
| * m 5 devpi: disable test for execnet14makefu2016-07-211-1/+1
| * m : update legacy options ,remove honeyd usage in shoneymakefu2016-07-214-11/+9
| * m 5 honeyd: removemakefu2016-07-213-105/+0
| * m 2 default: bump ref to 125ffffmakefu2016-07-201-2/+7
| * m 1 vbob: comment out extra-hostsmakefu2016-07-201-1/+1
| * m 1 wbob: add missingmakefu2016-07-202-6/+44
| * m 2 tinc: add missing retiolum configmakefu2016-07-201-0/+4
| * Merge remote-tracking branch 'prism/master'makefu2016-07-207-13/+37
| |\
| | * l 2 buildbot: set NIX_PATH to /var/srclassulus2016-07-191-1/+1
| | * l 2 buildbot: fix target stringlassulus2016-07-191-2/+2
| | * Merge remote-tracking branch 'gum/master'lassulus2016-07-193-10/+29
| | |\
| | * | l 2 nixpkgs: adapt to new populatelassulus2016-07-191-2/+2
| | * | l 2: add audit.nixlassulus2016-07-192-5/+15
| | * | l 1 prism: inherit home from krebs.users.tvlassulus2016-07-191-1/+1
| | * | Merge remote-tracking branch 'gum/master' into new-populatelassulus2016-07-1819-275/+366
| | |\ \
| | * | | s 2 repo-sync: change lassulus origin.url to prismlassulus2016-07-141-1/+1
| | * | | Merge remote-tracking branch 'gum/master'lassulus2016-07-1413-16/+161
| | |\ \ \
| | * | | | l 2 buildbot: add vbob wbob & shoneylassulus2016-07-141-1/+1
| | * | | | l 2 nixpkgs: 446d4c1 -> 11a7899lassulus2016-07-141-1/+1
| | * | | | l 2 websites fritz: add golbarrendiebstahllassulus2016-07-131-0/+14
| * | | | | s 1 test-all-krebs-modules: fix retiolummakefu2016-07-201-1/+1
| * | | | | / : s/krebs\.retiolum/krebs.tinc.retiolum/gmakefu2016-07-206-8/+8
| * | | | | makefu: s/krebs\.retiolum/krebs.tinc.retiolum/gmakefu2016-07-2011-30/+19
| * | | | | k 3 retiolum: krebs.retiolum is now officially obsoletemakefu2016-07-201-1/+0
| * | | | | k 3 exim-retiolum: assert to krebs.tinc.retiolum.enable againmakefu2016-07-201-1/+1
| * | | | | k 3 retiolum: prepare fallback to krebs.retiolummakefu2016-07-201-0/+1
| * | | | | k 3 retiolum: formattingmakefu2016-07-201-38/+42
| * | | | | k 3 retiolum: remove lib. for imp partmakefu2016-07-201-4/+4
| * | | | | k 3 retiolum: explicitly build users, secrets and servicesmakefu2016-07-201-52/+55
| * | | | | retiolum: config which is working but not functioning (see TODO in retiolum.nix)makefu2016-07-202-149/+152
| * | | | | m 1 vbob: document forticlientsslvpn messmakefu2016-07-182-4/+12
| * | | | | k 3 m: filepimp,omo expose lan netmakefu2016-07-181-1/+12
| | |_|_|/ | |/| | |
| * | | | k 2 bepasty-dual: use krebs.nginx.ssl + acmemakefu2016-07-181-7/+26
| * | | | k 3 retiolum-bootstrap: use secrets path as default, not /root/secretsmakefu2016-07-181-2/+2
* | | | | nginx: use host name and aliases as default server-namestv2016-07-221-6/+4
|/ / / /
* | | / m 2 default: rev -> refmakefu2016-07-181-1/+1
| |_|/ |/| |
* | | Merge 'cd/master'makefu2016-07-1816-261/+323
|\ \ \
| * | | alnus: inittv2016-07-172-0/+130
| * | | make deploy: admit debugtv2016-07-171-7/+13
| * | | Makefile: define default targettv2016-07-171-4/+4