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

• 6b946f9cc4 Merge branch 'feature/wink' into 'main' stuebinm 2021-03-24 21:13:25 +0000
• e4a0367a51
  sources: remove unecessary refs schweby 2021-03-24 21:30:06 +0100
• b604cee52a
  hainich/minecraft: Update to paper 1.16.6-167 schweby 2021-03-24 21:13:26 +0100
• 7bf935bd0e Merge branch 'feature/wink' into 'main' stuebinm 2021-03-24 19:35:32 +0000
• 077e8264f7
  hainich/hasenloch: set config suitable for r2r schweby 2021-03-24 19:28:22 +0100
• f54be467b8
  hainich/hasenloch: update to r2r version schweby 2021-03-24 19:19:33 +0100
• b28064a190 php nervt schweby 2021-03-24 18:18:32 +0100
• eb97d1150c update to newer version schweby 2021-03-24 18:09:39 +0100
• c9039a7c33
  hainich: init test engelsystem schweby 2021-03-24 09:49:59 +0100
• feddc2057f
  hainich: init test engelsystem schweby 2021-03-24 09:49:59 +0100
• 32aaf41ea8
  hainich: init test engelsystem schweby 2021-03-24 09:49:59 +0100
• efb9fb57c7 Merge branch 'feature/keytracker' into 'main' stuebinm 2021-03-23 17:04:40 +0000
• 12bd31f7e6 Merge branch 'feature/wink' into 'main' stuebinm 2021-03-22 22:52:29 +0000
• 1ddf9c4ba8
  wink: add cookie domain in oauth2-proxy stuebinm 2021-03-22 23:46:24 +0100
• 269fbeef3c Merge branch 'separatepipelines' into 'main' stuebinm 2021-03-22 22:20:52 +0000
• 5fb8a1b595
  pipeline: fix mistake in build command stuebinm 2021-03-22 23:10:01 +0100
• d6c29f8223 Merge branch 'obs-addons' into 'main' Lukas 2021-03-21 17:05:35 +0000
• 0a61f9d94a Merge branch 'separatepipelines' into 'main' stuebinm 2021-03-21 17:03:00 +0000
• a111743309 Merge branch 'feature/wink' into 'main' stuebinm 2021-03-21 01:47:58 +0000
• 432acb31e9
  wink: add nat and coredns to container stuebinm 2021-03-21 02:45:31 +0100
• 410937828b Merge branch 'feature/wink' into 'main' stuebinm 2021-03-20 18:43:19 +0000
• 3b99506f3b Merge remote-tracking branch 'origin/main' into feature/wink schweby 2021-03-20 19:41:18 +0100
• 7a43a6111e Merge branch 'feature/wink' into 'main' stuebinm 2021-03-20 16:11:58 +0000
• 99d534586a
  hainich/minecraft: update to paper 1.16.5-562 schweby 2021-03-20 17:09:58 +0100
• 7b81516a2f Merge branch 'minecraft' into 'main' schweby 2021-03-20 16:00:08 +0000
• 8377d27b87 hainich: init minecraft server schweby 2021-03-19 14:16:55 +0100
• 071f135ef4
  hainich: Blacklist ip_tables and ip6_tables schweby 2021-03-20 16:56:56 +0100
• 63fcf1fa06 Merge branch 'minecraft' into 'main' schweby 2021-03-20 13:52:42 +0000
• d3766126a1
  hainich: init minecraft server schweby 2021-03-19 14:16:55 +0100
• 4559f609b5 Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-19 20:29:24 +0000
• 0992d09864 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-03-19 15:14:58 +0000
• 90ea1ada58 Merge branch 'feature/wink' into 'main' stuebinm 2021-03-19 14:34:05 +0000
• d707ba5ef3
  wink: oauth2_proxy half-working stuebinm 2021-03-19 15:24:03 +0100
• ed3ac129dc Merge branch 'minecraft' into 'main' schweby 2021-03-19 14:23:58 +0000
• 299dba599d
  hainich: init minecraft server schweby 2021-03-19 14:16:55 +0100
• ad0de8133c
  hainich: init minecraft server schweby 2021-03-19 14:16:55 +0100
• c8d3641786
  hainich: init minecraft server schweby 2021-03-19 14:16:55 +0100
• e4c5f5a6ba
  wink: init oauth2-proxy configuration. stuebinm 2021-03-13 14:54:12 +0100
• 0127bbefcd
  Add wink (Wo ist meine Winkekatze?) for hacc-voc stuebinm 2021-02-22 15:20:07 +0100
• a9e5629564 Merge branch 'matrix-synapse' into 'main' schweby 2021-03-18 22:02:35 +0000
• 8c8f50323e
  synapse/element: nicer code layout for the config stuebinm 2021-03-18 23:01:41 +0100
• 42cb96fdfc Merge branch 'matrix-synapse' into 'main' Schweby mit Hut 2021-03-18 21:52:23 +0000
• 2c487d5505
  Synapse/Element: Fixed the config. stuebinm 2021-03-18 22:50:18 +0100
• 49e727248d Merge branch 'matrix-synapse' into 'main' Schweby mit Hut 2021-03-18 18:29:14 +0000
• fbfff0e1a7 hainich/matrix: init matrix & element schweby 2021-02-01 16:20:08 +0100
• 233ffdd769
  hainich/nginx: redirect hacc.space to hacc.earth schweby 2021-03-18 19:12:14 +0100
• 77c06c5509
  hainich/nginx: let all empty subdomains 404 schweby 2021-03-18 19:04:00 +0100
• 94eafe59d2
  hainich/nginx: remove rc3 cluster site schweby 2021-03-18 19:01:44 +0100
• 8bd08766ab Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-03-18 15:42:30 +0000
• 4e570fe5f2
  hainich: init limesurvey stuebinm 2021-03-18 16:35:19 +0100
• d8ce503c84 Merge branch 'matrix-synapse' into 'main' Schweby mit Hut 2021-03-18 12:30:53 +0000
• 3783670201
  hainich/matrix: init matrix & element schweby 2021-02-01 16:20:08 +0100
• d7b04f4fdb Merge branch 'matrix-synapse' into 'main' Schweby mit Hut 2021-03-18 09:26:52 +0000
• 9c528fac3f
  hainich/matrix: init matrix & element schweby 2021-02-01 16:20:08 +0100
• 4da45e8cda hainich/matrix: init matrix & element schweby 2021-02-01 16:20:08 +0100
• 6f990d184d
  this is a test schweby 2021-03-17 23:32:59 +0100
• 9f2864c349 Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-17 22:22:32 +0000
• c6df2c2a9d hainich/mattermost: disable external diagnostics schweby 2021-03-17 23:21:23 +0100
• 68120c7078 Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-17 22:13:02 +0000
• b07e4d08fa
  Mattermost: Enable networking for the container. stuebinm 2021-03-16 23:59:32 +0100
• f24da2510d
  mattermost: change url to mattermost-beta.infra4future.de stuebinm 2021-03-15 17:11:38 +0100
• a3a4264b38
  Patch mattermost module to allow secrets outside the nix store stuebinm 2021-03-15 17:04:27 +0100
• 3be22b7249
  init mattermost on hainich. stuebinm 2021-03-13 16:49:22 +0100
• 77c510cc9a Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-17 21:58:03 +0000
• 6795a2f393 Merge branch 'feature/keytracker' into 'main' stuebinm 2021-03-17 21:57:57 +0000
• cf5d4775e5 Merge branch 'bugfix/mumblesite' into 'main' stuebinm 2021-03-17 21:39:10 +0000
• dbbdde76c7
  mumble.hacc.space: move site from gitlab into nix derivation stuebinm 2021-03-17 22:35:51 +0100
• 0a3740c846 Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-16 23:02:39 +0000
• 3e952632fe
  Mattermost: Enable networking for the container. stuebinm 2021-03-16 23:59:32 +0100
• f3ec3c7a05 Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-15 16:14:11 +0000
• 64cc323191 mattermost: change url to mattermost-beta.infra4future.de stuebinm 2021-03-15 17:11:38 +0100
• 146adef87e Patch mattermost module to allow secrets outside the nix store stuebinm 2021-03-15 17:04:27 +0100
• d96e892330 Merge branch 'feature/keytracker' into 'main' stuebinm 2021-03-15 14:16:48 +0000
• 99cb717513 init keytracker on hainich. stuebinm 2021-03-15 15:08:45 +0100
• 0028506083 Merge branch 'separatepipelines' into 'main' stuebinm 2021-03-13 16:23:52 +0000
• 9ea243e6cf Merge branch 'feature/mattermost' into 'main' stuebinm 2021-03-13 16:14:37 +0000
• fcdae759c6 init mattermost on hainich. stuebinm 2021-03-13 16:49:22 +0100
• 9c9f5747ad Merge branch 'feature/wink' into 'main' stuebinm 2021-03-13 14:05:19 +0000
• 05d666b43b wink: init oauth2-proxy configuration. stuebinm 2021-03-13 14:54:12 +0100
• ee904f64f3 Add wink (Wo ist meine Winkekatze?) for hacc-voc stuebinm 2021-02-22 15:20:07 +0100
• 24236b852e wink: init oauth2-proxy configuration. stuebinm 2021-03-13 14:54:12 +0100
• 0553f3d7c1 Merge branch 'nextcloud-testing' into 'main' stuebinm 2021-03-13 12:32:36 +0000
• 32b5958279 security: remove hexchen mail schweby 2021-03-13 00:27:53 +0100
• bab826b1c7 security: remove hexchen schweby 2021-03-12 23:53:51 +0100
• db51a3adde common: set schweby's shell to fish schweby 2021-03-12 12:28:26 +0100
• 1d7aa8ca85 Merge branch 'nextcloud-testing' into 'main' stuebinm 2021-03-12 09:47:09 +0000
• eb9ac96804 Merge branch 'obs-addons' into 'main' Lukas 2021-03-11 22:10:58 +0000
• 25b3840359 Added NDI and Lniuxbrowser to OBS Lukas Schulz 2021-03-01 12:43:15 +0100
• e8fdd7453a Merge branch 'obs-addons' into 'main' Lukas 2021-03-10 23:45:57 +0000
• 9123a842cf Merge branch 'separatepipelines' into 'main' Matthias Stübinger 2021-03-10 23:43:09 +0000
• 6d32cc6f08 Separate pipelines for separate hosts. stuebinm 2021-03-11 00:36:19 +0100
• faee8da700 nixda: bump version of obs to nixpkgs/unstable stuebinm 2021-03-10 21:27:57 +0100
• 2d4309fdf4 hainich: init workadventure schweby 2021-03-10 21:28:20 +0100
• fc16308833 Fix workadventure map link stuebinm 2021-03-10 23:59:48 +0100
• 0fe4972811 bump version of obs to nixpkgs/unstable stuebinm 2021-03-10 21:27:57 +0100
• d6b34419a4 hainich: init workadventure schweby 2021-03-10 21:28:20 +0100
• dd2364790e nixda: switch obs to nixpkgs-unstable stuebinm 2021-03-10 21:27:57 +0100
• 70482efcba hainich: init workadventure schweby 2021-03-10 21:28:20 +0100
• 9bffa84865 Merge branch 'obs-addons' into 'main' Lukas 2021-03-10 20:39:32 +0000
• 9276d6eda9 hainich: init workadventure schweby 2021-03-10 21:28:20 +0100