summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | m 2 virtualbox: bump versionmakefu2016-07-111-2/+2
* | | m: nixpkgs@0546a4amakefu2016-07-111-1/+1
* | | m 1 shoney: configure forward-journalmakefu2016-07-112-4/+11
* | | ma 1 omo: init share usermakefu2016-07-111-1/+4
* | | m 1 darth: configure with forward-journal, sharemakefu2016-07-113-2/+72
* | | k 3 m: init honeydrivemakefu2016-07-111-0/+10
* | | ma: nixpkgs@0546a4amakefu2016-07-111-1/+1
| |/ |/|
* | Merge remote-tracking branch 'cd/master'lassulus2016-07-103-3/+51
|\|
| * test-all-krebs-modules: disable buildbot.mastertv2016-07-091-1/+3
| * Merge remote-tracking branch 'prism/master'tv2016-07-0917-42/+2450
| |\
| * | urlwatch: 2.1 -> 2.2tv2016-07-092-2/+48
* | | l 2 websites domsen: always_populate_raw_post_datalassulus2016-07-101-0/+1
* | | l 1 prism: add tv as userlassulus2016-07-101-0/+12
* | | l 2: add pop to pkgslassulus2016-07-101-0/+1
* | | l 5: add poplassulus2016-07-102-0/+11
* | | l 2 websites domsen: add /piwik to ubikmedialassulus2016-07-081-0/+6
| |/ |/|
* | l 1 mors: add zalando projectlassulus2016-07-081-6/+9
* | l 1 helios: disable ES (again)lassulus2016-07-081-5/+5
* | l 1 prism: add mk_sql_pairlassulus2016-07-081-0/+5
* | l 1 helios: use gnome3 as desktopManagerlassulus2016-07-081-2/+32
* | Merge remote-tracking branch 'cd/master'lassulus2016-07-081-0/+36
|\|
| * tv backup: add zutv2016-07-081-0/+36
* | l 1 prism: remove obsolete certfile optionlassulus2016-07-081-1/+0
* | Revert "l 1 uriel: update boot.loader options"lassulus2016-07-081-2/+2
* | s 2 repo-sync: adapt to new apilassulus2016-07-071-1/+1
* | Merge remote-tracking branch 'gum/master'lassulus2016-07-0711-20/+2378
|\ \
| * | m 5 farpd: initmakefu2016-06-283-2/+1669
| * | m 5 honeyd: initial commitmakefu2016-06-272-0/+104
| * | m 1 p: allow 24800 (synergy)makefu2016-06-271-1/+1
| * | k 5 awesomecfg: add kiosk configmakefu2016-06-273-0/+535
| * | k 3 m: add siem network, add ossim stubmakefu2016-06-271-0/+14
| * | wbob: add synergymakefu2016-06-271-18/+26
| * | m 5 ps3netsrv: initmakefu2016-06-242-0/+30
* | | Merge remote-tracking branch 'cd/master'lassulus2016-07-079-39/+309
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'prism/master'tv2016-07-077-37/+46
| |\ \
| * \ \ Merge remote-tracking branch 'prism/lassulus'tv2016-07-078-26/+74
| |\ \ \
| * | | | zu: inittv2016-07-072-0/+260
| * | | | tv: use timesyncdtv2016-07-035-4/+1
| * | | | tv: define journald default extraConfigtv2016-07-035-20/+7
| * | | | Revert "tv nginx: define events"tv2016-07-031-4/+0
| * | | | cd nginx: enable httpstv2016-07-031-11/+41
* | | | | Revert "l 5 q: use curl.bin"lassulus2016-07-071-1/+1
* | | | | l 1 prism: fix ssl for cgit.lassul.uslassulus2016-07-071-4/+17
| |_|/ / |/| | |
* | | | l 3 ejabberd: take config from tvlassulus2016-07-072-6/+16
* | | | l 1 helios: configure batter monitoringlassulus2016-07-071-0/+3
* | | | l 2 nixpkgs: c78f9ad -> 446d4c1lassulus2016-07-071-1/+1
* | | | Revert "l 2 websites: phpIni -> phpOptions"lassulus2016-07-072-25/+20
* | | | k 3 buildbot: use last working nixpkgslassulus2016-07-071-5/+6
| |/ / |/| |
* | | l 2: nix.useSandbox -> nix.useChrootlassulus2016-07-051-1/+1
* | | l 1 uriel: update boot.loader optionslassulus2016-07-051-2/+2