Merge remote-tracking branch 'origin/imap-server' into mampf-next

MaMpf-HD · Jan 7, 2022 · c45a6f2 · c45a6f2
2 parents 775ecbf + 3382262
commit c45a6f2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 3 deletions.
diff --git 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 2.7
+    - name: Set up Ruby 3
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
+        ruby-version: 3.0.3
     - 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
@@ -38,6 +38,17 @@ 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: ./../..
@@ -79,6 +90,11 @@ 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
@@ -60,7 +60,18 @@ services:
     restart: always
     image: memcached:alpine
     networks:
-      - mampf
+      - 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
 
 networks:
   postgres:

diff --git a/docker/production/docker.env b/docker/production/docker.env
@@ -16,6 +16,10 @@ 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