Commit graph

  • 328d63ea1f parsons: add nftables hexchen 2021-08-04 13:59:35 +0000
  • db69706363 Merge branch 'bmv_12-1' into 'main' schweby 2021-08-03 23:15:10 +0000
  • 746bcf49c0 Merge branch 'parsons-init' into 'main' hexchen 2021-08-03 17:19:28 +0000
  • cbeb0e86c1 mail: emergency alias hexchen 2021-08-03 17:13:46 +0000
  • 93207d200e Merge branch 'parsons-init' into 'main' hexchen 2021-07-29 20:35:30 +0000
  • 8df6019af4 Merge branch 'parsons-init' into 'main' hexchen 2021-07-29 20:35:15 +0000
  • 9d65719237 ci: add parsons hexchen 2021-07-29 20:35:07 +0000
  • 48d8d4faf2 hosts/parsons: init minimal config hexchen 2021-07-29 20:31:52 +0000
  • 539d1025bb sources: update nixpkgs to 21.05 hexchen 2021-07-29 20:31:14 +0000
  • 54ecfeceaa Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-07-29 06:52:14 +0000
  • 2f3d206102 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-07-29 06:49:44 +0000
  • d359500bd2 Merge branch 'bmv_12-1' into 'main' schweby 2021-07-29 00:29:26 +0000
  • d3e08e0247
    sources: update packages schweby 2021-07-28 22:31:23 +0200
  • aac25dd42c Merge branch 'mattermost-reply-threads' into 'main' stuebinm 2021-07-18 19:29:45 +0000
  • 2d0a5b9c22
    Merge branch 'mattermost-reply-threads' of https://gitlab.infra4future.de/hacc/infra/haccfiles into mattermost-reply-threads stuebinm 2021-07-18 21:28:28 +0200
  • 20bafd66c5
    mattermost: add recommended proxy settings stuebinm 2021-07-18 21:24:25 +0200
  • 3553c5b84a Merge branch 'bmv_12-1' into 'main' schweby 2021-07-18 13:54:28 +0000
  • ff684b0190 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-07-17 04:37:50 +0000
  • 37e6c5ae04 Merge branch 'mattermost-reply-threads' into 'main' stuebinm 2021-07-16 21:47:10 +0000
  • 2c0abd0cc4
    sources: set template for mattermost-server schweby 2021-07-16 23:38:54 +0200
  • 3b8aaaa139 Merge branch 'mattermost-reply-threads' into 'main' stuebinm 2021-07-16 18:52:05 +0000
  • 32e13edee1
    fix hashes stuebinm 2021-07-16 18:14:22 +0200
  • c438cf9ffb Merge branch 'mattermost-reply-threads' into 'main' stuebinm 2021-07-16 15:51:46 +0000
  • 69f5448aa3
    mattermost 5.34.3 → 5.37.0 stuebinm 2021-07-16 17:12:54 +0200
  • 86df358358 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-07-16 12:15:27 +0000
  • bfaa6a54ab
    sources: update packages schweby 2021-07-14 22:36:17 +0200
  • 04375f8152
    hainich: remove websites schweby 2021-07-14 22:15:03 +0200
  • 09371ab05e Merge branch 'bmv_12-1' into 'main' schweby 2021-07-09 07:33:12 +0000
  • 91ded7a706 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-07-02 17:12:45 +0000
  • 4f5b5ebfff Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-07-02 04:07:44 +0000
  • 725517a035
    sources: pin hexchen repo schweby 2021-07-01 18:55:12 +0200
  • e13091e0a0 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-30 14:06:47 +0000
  • f9fcb2bd67 Merge branch 'bmv_12-1' into 'main' schweby 2021-06-25 10:32:56 +0000
  • 6a408db9c1
    hotfix: add websites to hainich schweby 2021-06-25 11:38:47 +0200
  • 211762d592 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-24 14:54:33 +0000
  • 5b259f7ba7 Merge branch 'bmv_12-1' into 'main' schweby 2021-06-24 12:09:06 +0000
  • 776c4d2f0f
    sources: update packages schweby 2021-06-23 23:16:54 +0200
  • f6bf8c7c00
    hainich: remove A20 ghost schweby 2021-06-23 23:06:49 +0200
  • 792b3ec562 Merge branch 'bmv_12-1' into 'main' schweby 2021-06-16 20:16:33 +0000
  • a005e04855 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-06-13 18:02:26 +0000
  • 96062e10fb Merge branch 'update_21.5' into 'main' schweby 2021-06-13 15:01:31 +0000
  • c9d9f90383
    fix extraPath failure stuebinm 2021-06-13 16:17:50 +0200
  • ebcf7840e4
    fix extraPath failure stuebinm 2021-06-13 16:17:50 +0200
  • 4f18ad7b9a Merge branch 'update_21.5' into 'main' schweby 2021-06-13 13:51:34 +0000
  • 371a8bd8ab
    stop nix from complaining about double definitions stuebinm 2021-06-13 15:33:56 +0200
  • 0e5ebdb5fc
    docker: fix iptables and zfs override stuebinm 2021-06-13 15:14:42 +0200
  • 7614299a59
    delete double import from hainich stuebinm 2021-06-13 15:13:52 +0200
  • 155a8e0f48 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-13 07:51:46 +0000
  • e0632537e7 Merge branch 'update_21.5' into 'main' schweby 2021-06-11 20:49:19 +0000
  • 5fb63e10f5
    nixos-21.05: fix mailserver, unpin old version stuebinm 2021-06-11 22:45:38 +0200
  • 26af023fa6 Merge branch 'update_21.5' into 'main' schweby 2021-06-11 20:33:33 +0000
  • 81a78cce69 Merge branch 'fix/mediawiki-intersection-plugin' into 'main' Markus A 2021-06-11 17:09:43 +0000
  • df6f0baa71 hainich/mediawiki: Fix broken URL to plugin octycs 2021-06-11 19:08:22 +0200
  • c6c55a4342
    nixda/decklink: bump version of bmv to 12.1 schweby 2021-06-11 08:22:54 +0200
  • bea7133b93 Merge branch 'update_21.5' into 'main' schweby 2021-06-10 17:34:04 +0000
  • b6122c5c1b [BROKEN] update to 21.05 schweby 2021-06-10 19:25:37 +0200
  • 140466ab5d hainich: removed unused lines schweby 2021-06-10 19:24:45 +0200
  • e76f229cea Merge branch 'update_21.5' into 'main' schweby 2021-06-10 17:29:04 +0000
  • 795b47e1c4 [BROKEN] update to 21.05 schweby 2021-06-10 19:25:37 +0200
  • 531a7036ba hainich: removed unused lines schweby 2021-06-10 19:24:45 +0200
  • 37a1af149f Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-10 02:20:50 +0000
  • 4507280501 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-06-09 23:45:30 +0000
  • b092919a53 nixda:update desktopvideo to 12.0 schweby 2021-06-09 21:58:06 +0000
  • 26d06c6ad8 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-06-09 21:11:46 +0000
  • f71e150506 pkgs/decklink: update pachfiles for 12.0 schweby 2021-04-05 10:19:03 +0200
  • 92dc35ce05 apply version update to blackmagic-desktop-video too L3D 2021-04-04 21:33:17 +0200
  • 7b0ae5c95d Try to update desktopvideo to 12.0. L3D ワッフルマイスター 2021-04-04 15:27:36 +0000
  • 2a61db30b6 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-06-09 21:11:36 +0000
  • ab68332e2b sources: update packages schweby 2021-06-09 22:30:19 +0200
  • c053407942 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-06-09 02:23:04 +0000
  • b916f9880a Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-08 23:35:35 +0000
  • ee04dc52a8 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-06-07 12:55:45 +0000
  • d37899698c
    hainich: remove minecraft schweby 2021-06-06 18:22:24 +0200
  • 3357e955e5 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-06-04 08:41:41 +0000
  • e871e193db Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-03 15:56:40 +0000
  • fec87aa59d
    sources: update packages schweby 2021-06-03 17:25:47 +0200
  • 46a22dd9f8 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-06-03 04:04:50 +0000
  • fba043fc46 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-06-02 20:16:25 +0000
  • 88bba3bf2a Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-06-02 19:49:14 +0000
  • 378c79f93e hainich:add hedgedoc for i4f Lukas 2021-06-02 19:08:54 +0000
  • 4f3b82629c Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-05-31 03:06:40 +0000
  • 461dc25239 Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-27 19:10:31 +0000
  • 0e98185bdd
    hainich/hedgedoc-i4f: set psql auth schweby 2021-05-27 21:01:10 +0200
  • 1b9b7858c6 Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-27 18:41:41 +0000
  • 22690efe3a
    hainich/hedgedoc-i4f: fixed container name schweby 2021-05-27 20:36:13 +0200
  • 17d060e4ce Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-05-27 15:50:24 +0000
  • 77a52382fe Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-27 06:36:06 +0000
  • c772d1fbce
    hainich/hedgedoc: disentangle the config files schweby 2021-05-27 08:12:52 +0200
  • b79db6712e Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-05-27 00:25:09 +0000
  • a7d3e362d7 Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-26 20:56:10 +0000
  • c514e253d9
    Merge branch 'main' into infra4future-pad schweby 2021-05-26 22:49:09 +0200
  • 58402d9da9
    hainich/i4f-hedgedoc: disable login schweby 2021-05-26 22:48:57 +0200
  • e857084a42 Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-26 20:32:31 +0000
  • e9eb76c2b5
    update sources schweby 2021-05-26 22:31:06 +0200
  • 67d9a2036c Merge branch 'separatepipelines' into 'main' stuebinm 2021-05-22 10:15:10 +0000
  • 86d5d30125 Merge branch 'feature/pluto-notebooks' into 'main' stuebinm 2021-05-20 17:17:10 +0000
  • eb4515db1e
    add pluto notebook server stuebinm 2021-05-20 18:11:09 +0200
  • 97654d34ad Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-05-16 08:32:53 +0000
  • b304429215 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-05-16 01:18:09 +0000
  • f78a59d6f7 Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-12 20:07:49 +0000