From 4311633416985abd7e5599109fbf0034627142ec Mon Sep 17 00:00:00 2001
From: Fabian K <zebleck@users.noreply.github.com>
Date: Wed, 12 Jan 2022 16:29:54 +0100
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/imap-server'
 into mampf-next"

This reverts commit c45a6f2b369487c27fbd80644448b60612d525bf, reversing
changes made to 775ecbfbfbcd7957c67b02a64c4220cd4820db64.
---
 .github/workflows/linter.yml                    |  4 ++--
 docker/development/docker-compose.yml           | 16 ----------------
 docker/production/docker-compose.production.yml | 13 +------------
 docker/production/docker.env                    |  4 ----
 4 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 532355e45..6a8f54c16 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -6,10 +6,10 @@ jobs:
     name: A job to check rubocop linter errors
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 3
+    - name: Set up Ruby 2.7
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.3
+        ruby-version: 2.7.2
     - name: Install gems # usual step to install the gems.
       run: |
         bin/bundle config path vendor/bundle
diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml
index 4b1b381d2..c94157d61 100644
--- a/docker/development/docker-compose.yml
+++ b/docker/development/docker-compose.yml
@@ -38,17 +38,6 @@ services:
     ports:
       - "127.0.0.1:1080:1080"
 
-  imap:
-    image: antespi/docker-imap-devel:latest
-    ports:
-      - "1025:25"
-      - "10143:143"
-      - "10993:993"
-    environment:
-      - MAILNAME=localhost
-      - MAIL_ADDRESS=mampf@localhost
-      - MAIL_PASS=mampf
-
   mampf:
     build:
       context: ./../..
@@ -90,11 +79,6 @@ services:
       WEBPACKER_DEV_SERVER_HOST: webpacker
       MAMPF_REGISTRATION_TIMEFRAME: 25
       MAMPF_MAX_REGISTRATION_PER_TIMEFRAME: 40
-      IMAPSERVER: imap:10993
-      IMAP_TLS_IGNORE_CERT: 1
-      PROJECT_EMAIL_USERNAME: mampf
-      PROJECT_EMAIL_PASSWORD: mampf
-      PROJECT_EMAIL_MAILBOX: INBOX
       # uncomment DB_SQL_PRESEED_URL and UPLOADS_PRESEED_URL to enable db preseeding
       # DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20201128165713_mampf.sql&dl=1"
       # UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/d2f72a4069814debaf69/?dl=1"
diff --git a/docker/production/docker-compose.production.yml b/docker/production/docker-compose.production.yml
index c2f1ee6b7..2bba7ef34 100644
--- a/docker/production/docker-compose.production.yml
+++ b/docker/production/docker-compose.production.yml
@@ -60,18 +60,7 @@ services:
     restart: always
     image: memcached:alpine
     networks:
-      - default
-
-  solr:
-    image: solr:8.11
-    container_name: solr
-    ports:
-      - "127.0.0.1:8983:8983"
-    volumes:
-      - /path/to/persistent/var_solr:/var/solr
-    networks:
-      - default
-    restart: always
+      - mampf
 
 networks:
   postgres:
diff --git a/docker/production/docker.env b/docker/production/docker.env
index 8070eb0d9..12c214d28 100644
--- a/docker/production/docker.env
+++ b/docker/production/docker.env
@@ -16,10 +16,6 @@ MAILSERVER=mail.mathi.uni-heidelberg.de
 PROJECT_EMAIL=mampf@mathi.uni-heidelberg.de
 ERROR_EMAIL=mampf-error@mathi.uni-heidelberg.de
 MAILID_DOMAIN=mathi.uni-heidelberg.de
-IMAPSERVER=mail.mathi.uni-heidelberg.de
-PROJECT_EMAIL_USERNAME=creativeusername
-PROJECT_EMAIL_PASSWORD=secretsecret
-PROJECT_EMAIL_MAILBOX=Other Users/mampf
 
 # Due to CORS constraints, some urls are proxied to the media server
 DOWNLOAD_LOCATION=https://mampf.mathi.uni-heidelberg.de/mediaforward