summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
...
| | * krebs: move github known hosts to dedicated filetv2019-01-212-25/+41
| | * blessings: 1.2.0 -> 1.3.0tv2019-01-181-2/+2
| | * Merge remote-tracking branch 'prism/master'tv2019-01-1616-300/+321
| | |\
| * | \ Merge remote-tracking branch 'gum/master'lassulus2019-01-211-2/+2
| |\ \ \
| | * | | external: new ip for evemakefu2019-01-111-2/+2
| | * | | Merge remote-tracking branch 'lass/master'makefu2019-01-031-1/+1
| | |\ \ \
| | | * | | external matchbox: use free ipv4lassulus2019-01-031-1/+1
| * | | | | nixpkgs: 0396345 -> 97e0d53lassulus2019-01-181-3/+3
| * | | | | Merge remote-tracking branch 'ni/master'lassulus2019-01-162-1/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | krebs tinc: Broadcast = notv2019-01-161-0/+1
| | * | | per-user module: enable only if configuredtv2019-01-051-1/+1
| * | | | Reaktor plugins: merge task with todo, make task like todolassulus2019-01-103-55/+25
| * | | | external: use unused ip for matchboxmakefu2019-01-031-1/+1
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'lass/master'makefu2019-01-035-15/+61
| |\ \ \ | | | |/ | | |/|
| | * | krops: use nixpkgs derivation for cilassulus2019-01-031-7/+7
| | * | nixpkgs: b9fa31c -> 0396345lassulus2019-01-031-3/+3
| | * | external: add matchboxlassulus2019-01-021-0/+24
| * | | ma cake.r: add Mic92 ssh key to authorized keysmakefu2018-12-311-0/+1
* | | | 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