summaryrefslogtreecommitdiffstats
path: root/krebs
Commit message (Expand)AuthorAgeFilesLines
* nixpkgs: 71326cd -> c06613classulus2021-07-091-4/+4
* nixpkgs-unstable: 1905f5f -> 3a8d795lassulus2021-06-301-4/+4
* nixpkgs: 8112fbe -> 71326cdlassulus2021-06-301-4/+4
* Merge remote-tracking branch 'ni/master'lassulus2021-06-251-0/+1
|\
| * Merge remote-tracking branch 'prism/master'tv2021-06-185-8/+15
| |\
| * | repo-sync: isSystemUsertv2021-06-151-0/+1
* | | nixpkgs-unstable: fbfb794 -> 1905f5flassulus2021-06-251-4/+4
* | | nixpkgs: bad3ccd -> 8112fbelassulus2021-06-251-4/+4
| |/ |/|
* | nixpkgs: 1f91fd1 -> bad3ccdlassulus2021-06-181-4/+4
* | external: add ed25519 pubkey of makanek.rlassulus2021-06-161-0/+1
* | krebs: init neos, add ssh key to shack infra managersmakefu2021-06-153-2/+8
* | brockman: 3.4.3 -> 3.4.5lassulus2021-06-141-2/+2
* | nixpkgs: 60cce7e -> 1f91fd1lassulus2021-06-131-4/+4
|/
* Merge remote-tracking branch 'prism/master'tv2021-06-1035-242/+318
|\
| * wiki: fix old references to krebs.gollumlassulus2021-06-091-3/+3
| * buildbot-classic: fix build on 21.05lassulus2021-06-092-3/+40
| * nixpkgs: 5de44c1 -> 60cce7elassulus2021-06-091-4/+4
| * Revert "buildbot-classic: build with python 3"lassulus2021-06-091-6/+7
| * Merge remote-tracking branch 'lass/master'makefu2021-06-0913-161/+235
| |\
| | * wiki: fix ascii errorlassulus2021-06-091-0/+2
| | * gollum: follow upstreamlassulus2021-06-093-114/+1
| | * mic92: fix key for hydrogenJörg Thalheim2021-06-091-1/+1
| | * mic92: add ed25519 keys for hydrogenJörg Thalheim2021-06-081-0/+1
| | * mic92: new ed25519 key for roseJörg Thalheim2021-06-081-1/+1
| | * mic92: add ed25519 keys for eve/evaJörg Thalheim2021-06-081-0/+3
| | * mic92: add more ed25519 retiolum keysJörg Thalheim2021-06-081-6/+9
| | * mic92: start adding ed25519 as wellJörg Thalheim2021-06-081-0/+2
| | * mic92: fix nardole's public ipsJörg Thalheim2021-06-081-2/+2
| | * mic92: remove anindyaJörg Thalheim2021-06-081-19/+0
| | * mic92: add aendernixJörg Thalheim2021-06-081-0/+24
| | * mic92: nardole: update key + add ip addressesJörg Thalheim2021-06-081-6/+16
| | * bill: add ip addresses + new keyJörg Thalheim2021-06-081-6/+16
| | * mic92: move loki.r to evaJörg Thalheim2021-06-081-1/+1
| | * mic92: change ip address of evaJörg Thalheim2021-06-081-2/+2
| | * Merge remote-tracking branch 'ni/master'lassulus2021-06-082-3/+5
| | |\
| | * | module ergo: initlassulus2021-06-083-0/+150
| | * | Merge remote-tracking branch 'ni/master'lassulus2021-06-081-6/+5
| | |\ \
| | | * | flameshot-once: 1.3.0 -> 1.4.0tv2021-06-081-6/+5
| | * | | nixpkgs-unstable: 7a1fbc3 -> fbfb794lassulus2021-06-071-4/+4
| | * | | nixpkgs: aa57635 -> 5de44c1lassulus2021-06-071-4/+4
| | * | | realwallpaper: use imagemagick6 (future lassulus has to understand 7)lassulus2021-06-061-2/+1
| | * | | jeschli enklave.r: disable cilassulus2021-06-061-0/+1
| * | | | ma samba: remove isNormalUser againmakefu2021-06-061-2/+1
| * | | | puyak.r/shack: isSystemUser everythingmakefu2021-06-057-1/+10
| * | | | module urlwatch: add isSystemUsermakefu2021-06-051-0/+1
| * | | | Merge remote-tracking branch 'lass/21.05' into 21.05makefu2021-06-051-7/+6
| |\| | |
| | * | | buildbot-classic: build with python 3lassulus2021-06-051-7/+6
| * | | | ma: isSystemUser everythingmakefu2021-06-051-0/+1
| |/ / /
| * | | tinc_graphs: isSystemUserlassulus2021-06-051-0/+1
| * | | realwallpaper: isSystemUserlassulus2021-06-051-0/+1