summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2018-12-1618-617/+713
|\
| * wirelum -> wiregrilllassulus2018-12-161-9/+9
| * l: rip xerxeslassulus2018-12-151-40/+0
| * l: update shodan wirelum keylassulus2018-12-151-1/+1
| * l: set short ipv6 addresses for all hostslassulus2018-12-151-13/+37
| * Merge remote-tracking branch 'lass/master' into HEADmakefu2018-12-128-439/+449
| |\
| | * krebs hosts: add owner to testHosts, too ^_^'tv2018-12-111-2/+2
| | * hosts.*.net.retiolum.ip6.addr: use genipv6tv2018-12-116-118/+70
| | * l: add morpheus.rlassulus2018-12-091-0/+29
| | * l: add wirelum to prism, mors, shodan, icarus, yellowlassulus2018-12-091-1/+40
| | * l: add phone.wlassulus2018-12-091-1/+19
| | * dns.providers: add wirelum (w)lassulus2018-12-091-0/+1
| | * git: set correct owner on /tmp/cgitlassulus2018-12-061-1/+1
| | * l hosts: remove deprecated gg23 netlassulus2018-12-051-10/+0
| | * move external hosts from lass to externallassulus2018-12-053-313/+313
| | * remove unused domsen-nas hostlassulus2018-12-051-14/+0
| | * l: remove deprecated iso hostlassulus2018-12-051-5/+0
| * | ma: sort hostnames for euer, add netdata.euer.krebsco.demakefu2018-12-101-25/+27
| * | Merge remote-tracking branch 'lass/master' into HEADmakefu2018-12-0511-180/+259
| |\|
| | * snews: prefix with _lassulus2018-12-051-155/+155
| | * l: adopt scardanelli & homeros (kmein)lassulus2018-12-041-0/+60
| | * Merge remote-tracking branch 'ni/master'lassulus2018-12-041-0/+35
| | |\
| | | * cabal-read: inittv2018-12-031-0/+35
| | * | Reaktor: add user only if activelassulus2018-12-031-1/+1
| | * | tinc_graphs: use genid_uint31lassulus2018-12-031-1/+1
| | * | fetchWallpaper: use genid_uint31lassulus2018-12-031-1/+1
| | * | bepasty-server: use genid_uint31lassulus2018-12-031-2/+2
| * | | cache.nsupdate.info: bump indexmakefu2018-12-031-1/+1
| * | | cache.nixos.org: provide index.htmlmakefu2018-12-032-12/+16
| * | | Merge remote-tracking branch 'lass/master'makefu2018-11-304-72/+220
| |\ \ \
| * | | | k binary-cache: use https://cache.krebsco.demakefu2018-11-301-1/+1
| * | | | ma: fix ssh key of ulrichmakefu2018-11-301-1/+1
* | | | | Merge branch 'master' of prism.r:stockholmjeschli2018-12-0427-471/+660
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | l: remove more fritzlassulus2018-12-031-3/+0
| * | | | Merge remote-tracking branch 'ni/master'lassulus2018-12-032-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | urlwatch service: use genid_uint31tv2018-12-021-1/+1
| | * | | github-hosts-sync service: use genid_uint31tv2018-12-021-1/+1
| * | | | Merge remote-tracking branch 'ni/master'lassulus2018-11-302-15/+2
| |\| | | | | |_|/ | |/| |
| | * | lib: add mapNixDir{,1}tv2018-11-302-15/+2
| * | | l: RIP cabal.rlassulus2018-11-301-41/+0
| * | | maintain realwallpaper in stockholmlassulus2018-11-302-25/+184
| * | | l: move download stuff to yellow.rlassulus2018-11-301-0/+30
| |/ /
| * / xmonad-stockholm: 1.2.0 -> 1.3.0tv2018-11-291-6/+6
| |/
| * * krops: merge krebs-nixpkgs into krebs-sourcelassulus2018-11-281-20/+18
| * Merge remote-tracking branch 'ni/master' into cilassulus2018-11-281-7/+9
| |\
| | * krebs: integrate 5pkgs as overlaytv2018-11-271-7/+9
| * | krops: reformat secrets (style)lassulus2018-11-281-12/+8
| * | * krops: get nixpkgs from store for cilassulus2018-11-281-1/+15
| * | ci: js -> json, output to stderrlassulus2018-11-281-4/+4
| * | ci get_steps: explicit pkg referenceslassulus2018-11-271-3/+3
| |/