Commit graph

  • 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
  • 8102d827b0 Merge branch 'mattermost-update' into 'main' stuebinm 2021-05-03 14:20:39 +0000
  • 6c09d30302 Merge branch 'A20' into 'main' schweby 2021-05-03 10:29:17 +0000
  • aa61079e3f
    hainich/A20: fix port overlapping schweby 2021-05-03 12:16:51 +0200
  • 67b4fb0e4f
    shortcutdomains: generate an index page stuebinm 2021-05-03 12:08:25 +0200
  • 55a285e21e
    shortcutdomains: more shortcuts stuebinm 2021-05-03 11:51:39 +0200
  • d3237b8eae
    shortcutdomains: 301 redirect -> 302 redirect stuebinm 2021-05-03 11:50:37 +0200
  • 13879b3c8b Merge branch 'infra4future-pad' into 'main' Lukas 2021-05-02 08:39:56 +0000
  • fb93853830 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-05-02 04:26:01 +0000
  • 4df39ecf2a Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-05-02 02:53:05 +0000
  • cea8c9c4db Merge branch 'A20' into 'main' schweby 2021-05-01 17:36:43 +0000
  • 20fe27b698
    hainich: init ghost A20 schweby 2021-05-01 08:37:41 +0200
  • c1de32e5aa
    waszumfff: rename ghost nixfile schweby 2021-05-01 08:34:50 +0200
  • 0939f25fad Merge branch 'A20' into 'main' schweby 2021-05-01 16:51:22 +0000
  • 1e57204b7a
    sources: update packages schweby 2021-05-01 18:48:15 +0200
  • caa48dc8dd Merge branch 'A20' into 'main' schweby 2021-05-01 06:47:19 +0000
  • 834dfccc8e
    hainich: init ghost A20 schweby 2021-05-01 08:37:41 +0200
  • ae6ba9755e
    waszumfff: rename ghost nixfile schweby 2021-05-01 08:34:50 +0200
  • b0e943a4bb Merge branch 'mattermost-update' into 'main' stuebinm 2021-04-30 21:24:33 +0000
  • 6ebff165e3 Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-04-30 06:23:58 +0000
  • da44a3eb05 Merge branch 'separatepipelines' into 'main' stuebinm 2021-04-30 03:31:48 +0000
  • 5f5c3119c4 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-04-29 23:43:22 +0000
  • bed75fbb67 Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 22:27:37 +0000
  • 997daf07ac
    deduplicate hedgedoc stuebinm 2021-04-30 00:06:29 +0200
  • 942b1a45aa Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 22:26:07 +0000
  • b7ef88d781 Merge branch 'workadventure-turn-fix' into 'main' stuebinm 2021-04-29 22:20:13 +0000
  • 9e7a277b6a workadventure: fix turn ipv4 address stuebinm 2021-04-22 18:25:53 +0200
  • 4c98cea532 Merge branch 'l3d/haccfiles-l3d-main-patch-97974' into 'main' schweby 2021-04-29 22:19:17 +0000
  • 47d24724e0 Merge branch 'workadventure-turn-fix' into 'main' stuebinm 2021-04-29 22:18:20 +0000
  • 9c9f3a0d56 Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 22:16:42 +0000
  • de81b33ba4 Das klingt mir sehr sinnvoll Lukas 2021-04-29 22:14:10 +0000
  • 1058b737f3 Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 22:06:42 +0000
  • 5589554be5 changed ip in the nginx reverse proxy to the correct one Lukas Schulz 2021-04-30 00:06:30 +0200
  • 4a7b73db68 Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 21:15:40 +0000
  • ab108ba486 added configuration for infra4future pads Lukas Schulz 2021-04-29 23:00:27 +0200
  • 36e54a5e9e Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 21:10:53 +0000
  • 8f5c21b07b Revert "updated gitignore for macos" Lukas Schulz 2021-04-29 23:07:26 +0200
  • 7469334600 Merge branch 'infra4future-pad' into 'main' Lukas 2021-04-29 21:01:14 +0000
  • 3f6d76e39a added configuration for infra4future pads Lukas Schulz 2021-04-29 23:00:27 +0200
  • ab0e13917c Merge branch 'gitignore-macos' into 'main' Lukas 2021-04-29 20:30:37 +0000
  • 5122efd2ce updated gitignore for macos Lukas Schulz 2021-04-29 22:29:07 +0200
  • 915c900b1f Merge branch 'feature/limesurvey' into 'main' stuebinm 2021-04-29 19:17:37 +0000
  • 45fef78e9f Merge branch 'separatepipelines' into 'main' stuebinm 2021-04-29 19:05:54 +0000
  • 586c9f5c91 Merge branch 'hedgedoc_samesite_cookie' into 'main' Lukas 2021-04-28 22:44:02 +0000
  • 2aa6f40153 Changed Samesite Attribute Lukas Schulz 2021-04-29 00:40:47 +0200
  • 9961003040 Merge branch 'mattermost-update' into 'main' stuebinm 2021-04-28 20:30:55 +0000
  • ae8bf7c8f6
    sources: manage mattermost with niv schweby 2021-04-28 22:24:35 +0200
  • f5655f08ea Merge branch 'mattermost-update' into 'main' stuebinm 2021-04-28 20:19:54 +0000
  • f9651af65f
    Merge branch 'main' into mattermost-update schweby 2021-04-28 22:19:30 +0200
  • 148741f4c3
    sources: update packages schweby 2021-04-28 22:01:02 +0200
  • 2735ab360c Merge branch 'matrix-synapse' into 'main' schweby 2021-04-28 19:39:09 +0000
  • a5233f2b4e Merge branch 'mattermost-update' into 'main' stuebinm 2021-04-28 19:29:45 +0000
  • 3839c8b8d2 Merge branch 'matrix-synapse' into 'main' schweby 2021-04-27 21:57:03 +0000
  • b155aad479 Merge branch '7-mediawiki-fails-to-build' into 'main' schweby 2021-04-27 09:11:03 +0000
  • 3067d1b8fb
    hainich/mediawiki: set static URL for WikiDB schweby 2021-04-27 11:09:42 +0200