summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'lass/master'makefu2017-02-0426-329/+458
|\
| * l 2 monitoring client: add collectd configlassulus2017-02-031-0/+59
| * l 2 monitoring client: add more telegraf defaultslassulus2017-02-031-1/+4
| * l 3 telegraf: add interval optionlassulus2017-02-031-1/+5
| * l 3 telegraf: set default db to `telegraf_db`lassulus2017-02-031-1/+1
| * l 2 monitoring server: add collectdb supportlassulus2017-02-031-0/+7
| * l 2 downloading: add icarus to authorized_keyslassulus2017-02-031-0/+1
| * l 1 prism: remvoe sed-plugin from #coders botlassulus2017-02-031-1/+0
| * l 1 mors: remove /mnt/publiclassulus2017-02-031-5/+0
| * l 2 tests dummy-secrets bepasty: fix assertionlassulus2017-01-311-1/+1
| * l 1 prism: protect bepasty from external iplassulus2017-01-311-1/+10
| * l 2 tests dummy-secrets: add bepasty-secret.nixlassulus2017-01-311-0/+1
| * l 1 prism: import bepasty.nixlassulus2017-01-311-0/+1
| * l 2: add bepasty.nixlassulus2017-01-311-0/+40
| * k 3 {l,m}: move paste.r to prismlassulus2017-01-312-1/+1
| * l 2 websites domsen: add joemisch.com to ubikmedialassulus2017-01-311-0/+1
| * l 2 nixpkgs: 3909827 -> 5fff5a9lassulus2017-01-311-1/+1
| * l 2: enable monitoring on every hostlassulus2017-01-301-0/+1
| * l 1 prism: import monitoring serverlassulus2017-01-301-0/+1
| * l 2 monitoring: introduce {client,server}.nixlassulus2017-01-302-0/+91
| * l 3 telegraf: split config into inputs/outputslassulus2017-01-301-10/+23
| * l 2: remove deprecated MANPAGER declarationlassulus2017-01-301-1/+0
| * l 1 prism: remove obsolete public_htmllassulus2017-01-301-14/+0
| * l 2 hw tp-x220: remove broken sna accelerationlassulus2017-01-301-7/+0
| * l 3 kapacitor: better defaultslassulus2017-01-301-115/+2
| * l 1 mors: cleanuplassulus2017-01-301-142/+50
| * k 3 l: remove obsolte domsen_nas pubkeylassulus2017-01-301-1/+0
| * l 3 kapacitor: add alert definitionlassulus2017-01-281-0/+31
| * l 2 fetchWallpaper: add maxTime of 10 secslassulus2017-01-261-0/+1
| * k 3 fetchWallpaper: add maxTime optionlassulus2017-01-261-1/+6
| * l 1 prism: I'm not proud of this commitlassulus2017-01-261-10/+10
| * l 2 repo-sync: merge from onondagalassulus2017-01-261-0/+4
| * l 2 git: remove nin from announced brancheslassulus2017-01-261-1/+1
| * l 1 prism: remove obsolete nin stufflassulus2017-01-262-12/+18
| * n 2: add git confignin2017-01-263-0/+72
| * n 6: add to dummysecrets hashedPassword.nixnin2017-01-261-0/+1
| * n: move termite to default pkgsnin2017-01-262-1/+1
| * n 2: add prism as binary-cachenin2017-01-261-0/+6
| * n 2: add dummy secrectsnin2017-01-262-1/+4
| * n 1 hiawatha: sort, delete, add pkgsnin2017-01-261-5/+4
| * n 2: add git status aliasnin2017-01-261-0/+4
| * n 2: remove MANPAGERnin2017-01-261-1/+0
* | m 2 logging: add deadman triggermakefu2017-02-041-0/+36
* | Merge remote-tracking branch 'lass/master'makefu2017-01-2563-391/+2536
|\|
| * l 3 kapacitor: use more defaultslassulus2017-01-241-1/+121
| * l 1 prism: do more stuff in #coderslassulus2017-01-231-5/+38
| * l 1 icarus: use grubs crytpodisk & remove /bootlassulus2017-01-221-4/+2
| * l 5 init: remove deprecated /bootlassulus2017-01-221-18/+2
| * l 2: add smartd.nix & import in tp-x220lassulus2017-01-222-0/+20
| * l 3 usershadow: user passwd passwords for sshdlassulus2017-01-221-2/+5