summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* test-all-krebs-modules: disable buildbot.mastertv2016-07-091-1/+3
|
* Merge remote-tracking branch 'prism/master'tv2016-07-0917-42/+2450
|\
| * 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
| |\
| * | l 1 prism: remove obsolete certfile optionlassulus2016-07-081-1/+0
| | |
| * | Revert "l 1 uriel: update boot.loader options"lassulus2016-07-081-2/+2
| | | | | | | | | | | | This reverts commit f9c561566d1b18bb89f0eff33cdbd0225300ab2f.
| * | 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
| |\ \ \
| * | | | Revert "l 5 q: use curl.bin"lassulus2016-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit f12578c66f8b7b829c0dec5255f358778c0d3366.
| * | | | l 1 prism: fix ssl for cgit.lassul.uslassulus2016-07-071-4/+17
| | | | |
* | | | | urlwatch: 2.1 -> 2.2tv2016-07-092-2/+48
| |_|_|/ |/| | |
* | | | tv backup: add zutv2016-07-081-0/+36
| |/ / |/| |
* | | Merge remote-tracking branch 'prism/master'tv2016-07-077-37/+46
|\| |
| * | 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
| | | | | | | | | | | | This reverts commit abdf11a17331401e3fca5e73dd38b241614c5aea.
| * | k 3 buildbot: use last working nixpkgslassulus2016-07-071-5/+6
| | |
* | | Merge remote-tracking branch 'prism/lassulus'tv2016-07-078-26/+74
|\| |
| * | l 2: nix.useSandbox -> nix.useChrootlassulus2016-07-051-1/+1
| | |
| * | l 1 uriel: update boot.loader optionslassulus2016-07-051-2/+2
| | |
| * | l: build module from 2/umtslassulus2016-07-054-12/+57
| | |
| * | l 3 power-action: add option for batterylassulus2016-07-051-2/+6
| | |
| * | use buildbot from 15.09lassulus2016-07-042-9/+8
| | |
* | | 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
| | | | | | | | | | | | This reverts commit 9962ba1036945652c1b1cfd661d92377b4dc691e.
* | | cd nginx: enable httpstv2016-07-031-11/+41
|/ /
* | Revert "buildbot: RIP"lassulus2016-07-031-0/+8
| | | | | | | | This reverts commit c786da701a9a430df7ee398c14cbaadb9e0fabb0.
* | tv vim: unlet b:current_syntax if existstv2016-07-031-1/+3
| |
* | tv vim: add jq syntaxtv2016-07-031-0/+12
| |
* | writeJq: inittv2016-07-031-0/+11
| |
* | Merge remote-tracking branch 'prism/master'tv2016-07-036-14/+43
|\ \
| * \ Merge commit '2408e27fb198634c5e47885e5793ec2b96bcc3a5'lassulus2016-07-011-0/+24
| |\ \
| * | | l 2 websites domsen: fix some cert generationlassulus2016-07-011-2/+2
| | | |
| * | | k 5 go: set url to cgit.lassul.uslassulus2016-07-011-1/+1
| | | |
| * | | l 2 git: remove miefdalassulus2016-06-301-1/+1
| | | |
| * | | Merge remote-tracking branch 'cd/master'lassulus2016-06-3034-2924/+266
| |\ \ \