Commit graph

Select branches

Hide pull requests

24_04-remove-nftables_ruleset

main

mattermost-9.11

mattermost-kanidm

mattermost-update

monit-onlyoffice-restart

nextcloud-docs-on-website

nicer-nftables

onlyoffice-nix

removing-nix-hexchen

#1

#10

#11

#12

#2

#3

#4

#5

#6

#7

#9

Mono Color

• 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
• 8c71208405 Merge branch 'fix/deploy-gc' into 'main' hexchen 2021-05-12 20:05:19 +0000
• 8506265060
  sources: update packages schweby 2021-05-12 21:41:53 +0200
• 51a0cbfedb Merge branch 'fix/deploy-gc' into 'main' hexchen 2021-05-12 19:39:54 +0000
• 644c433809 hainich: init ghost A20 schweby 2021-05-12 19:37:15 +0000
• 728edd88a0 Merge branch 'A20' into 'main' schweby 2021-05-12 19:22:31 +0000
• ae330a0a5f hainich/A20_ghost: fix internal port schweby 2021-05-05 12:17:07 +0200
• 309d45a19f hainich/A20: fix port overlapping schweby 2021-05-03 12:16:51 +0200
• 63b6b01e0a hainich: init ghost A20 schweby 2021-05-01 08:37:41 +0200
• 6597fbd979 waszumfff: rename ghost nixfile schweby 2021-05-01 08:34:50 +0200
• fc91ae158d Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-10 18:24:34 +0000
• a1871a521c
  backups: add hedgedoc instance pac.infra4future.de stuebinm 2021-05-10 20:20:33 +0200
• 8b8aea10d9
  delete hainich/services/hedgedoc-i4f.nix stuebinm 2021-05-10 20:20:02 +0200
• 3930d41501 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-05-10 14:49:19 +0000
• edf4a99829 Merge branch 'fix/deploy-gc' into 'main' hexchen 2021-05-10 14:48:25 +0000
• f42cc7a293 sources: update nix/hexchen hexchen 2021-05-10 14:46:47 +0000
• 049aae4b1d Merge branch 'A20' into 'main' schweby 2021-05-10 14:44:40 +0000
• e3044d4c30 Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-10 14:43:28 +0000
• 798bd907a0 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-05-10 14:42:54 +0000
• 7d2e5f7576 ci: split up pipelines by host stuebinm 2021-03-11 00:36:19 +0100
• 1be06e576a Merge branch 'separatepipelines' into 'main' stuebinm 2021-05-10 14:41:07 +0000
• 3b39b0f316 hainich/gitlab-runner: limit nix builds to 1 hexchen 2021-05-10 14:39:51 +0000
• 338a919c5c Merge branch 'separatepipelines' into 'main' stuebinm 2021-05-10 14:39:18 +0000
• 335700dd37 ci: split up pipelines by host stuebinm 2021-03-11 00:36:19 +0100
• a928e71502 Merge branch 'separatepipelines' into 'main' stuebinm 2021-05-10 14:36:20 +0000
• bb11e58ea6 Merge branch 'A20' into 'main' schweby 2021-05-10 14:29:31 +0000
• 3324a865d9 hainich/A20_ghost: fix internal port schweby 2021-05-05 12:17:07 +0200
• 10993c1b7c hainich/A20: fix port overlapping schweby 2021-05-03 12:16:51 +0200
• 000a492e28 hainich: init ghost A20 schweby 2021-05-01 08:37:41 +0200
• 8511cd118d waszumfff: rename ghost nixfile schweby 2021-05-01 08:34:50 +0200
• d83770a03e Merge branch 'A20' into 'main' schweby 2021-05-10 14:28:38 +0000
• 825d184a84 Merge branch 'mail/c3wooc' into 'main' stuebinm 2021-05-08 18:08:44 +0000
• 3d8db75c48
  mail: add addresses for c3wooc stuebinm 2021-05-08 20:06:00 +0200
• a897ec8519 Merge branch 'A20' into 'main' schweby 2021-05-05 10:19:45 +0000
• f566e30e82
  hainich/A20_ghost: fix internal port schweby 2021-05-05 12:17:07 +0200
• 85ae01006a Merge branch 'separatepipelines' into 'main' stuebinm 2021-05-03 14:27:33 +0000