summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2018-12-2820-227/+314
|\
| * external: remove miaoski wrong subnetlassulus2018-12-261-3/+0
| * external: add kmein pubkeylassulus2018-12-262-0/+3
| * external: add miaoskilassulus2018-12-251-0/+16
| * l daedalus.w: fix aliaslassulus2018-12-251-1/+1
| * external: set wiregrill ip6lassulus2018-12-251-0/+3
| * nixpkgs: 7e88992 -> b9fa31classulus2018-12-241-3/+3
| * l daedalus: fix typo in ipv6lassulus2018-12-241-2/+8
| * l wiregrill: remove obsolete ipv4lassulus2018-12-241-3/+0
| * nixpkgs: 5d4a1a3 -> 7e88992lassulus2018-12-191-3/+3
| * external: move tpsw from makefu, add justrautemakefu2018-12-194-56/+53
| * external: sortmakefu2018-12-191-176/+176
| * external: move users from makefu namespace to externalmakefu2018-12-196-16/+23
| * Merge remote-tracking branch 'ni/master'lassulus2018-12-1810-7/+40
| |\
| | * tv: configure the wiregrilltv2018-12-189-6/+35
| | * lass prism: set wiregrill subnets explicitlytv2018-12-181-1/+5
| * | external: add qubasalassulus2018-12-181-0/+28
| |/
* | 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
|\ \ \ \ \ | | |_|/ / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 08:00:32 +0000