summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism.r:stockholmjeschli2019-01-2910-140/+252
|\
| * Reaktor: 0.6.2 -> 0.7.0tv2019-01-271-2/+3
| * reaktor2 service: user -> username + proper typetv2019-01-271-5/+5
| * Reaktor sed-plugin: use mirc colorcodeslassulus2019-01-271-0/+4
| |\
| | * reaktor2 service: add useTLS optiontv2019-01-271-0/+4
| * | reaktor2: add user optionlassulus2019-01-271-3/+7
| * | Merge remote-tracking branch 'ni/master'lassulus2019-01-221-0/+1
| |\|
| | * krebs: import reaktor2 servicetv2019-01-221-0/+1
| * | Mic92: change mail addresslassulus2019-01-211-1/+1
| * | external: add idontcare.rlassulus2019-01-211-0/+23
| * | Merge remote-tracking branch 'ni/master'lassulus2019-01-216-134/+188
| |\|
| | * reaktor2 service: inittv2019-01-211-0/+63
| | * krebs hosts: extraHost -> hoststv2019-01-211-13/+12
| | * krebs: move hosts to dedeicated filetv2019-01-213-25/+38
| | * krebs: move retiolum-hosts to dedicated filetv2019-01-212-23/+29
| | * krebs: move dns stuff to dedicated filetv2019-01-212-18/+20
| | * krebs: move exim aliases to dedicated filetv2019-01-211-45/+0
| | * krebs: move github known hosts to dedicated filetv2019-01-212-25/+41
| | * Merge remote-tracking branch 'prism/master'tv2019-01-1610-235/+285
| | |\
| * | \ Merge remote-tracking branch 'gum/master'lassulus2019-01-211-2/+2
| |\ \ \
| | * | | external: new ip for evemakefu2019-01-111-2/+2
| | | |/ | | |/|
| * | | 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
| * | external matchbox: use free ipv4lassulus2019-01-031-1/+1
| * | external: add matchboxlassulus2019-01-021-0/+24
* | | Merge branch 'master' of prism.r:stockholmjeschli2018-12-2819-224/+311
|\| |
| * | 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
| * | l daedalus: fix typo in ipv6lassulus2018-12-241-2/+8
| * | l wiregrill: remove obsolete ipv4lassulus2018-12-241-3/+0
| * | 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-1614-459/+516
|\|
| * 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