Merge pull request #156 from er123451/ckan-2.10.5

Ckan 2.10.5

.env.example

@@ -125,15 +125,17 @@ [email protected]
 CKAN_STORAGE_PATH=/var/lib/ckan
 CKAN_LOGS_PATH=/var/log
 # SMTP settings
-CKAN_DOCKER_SMTP_ENABLED=False
-CKAN_SMTP_SERVER=smtp.corporateict.domain:25
-CKAN_SMTP_STARTTLS=True
-CKAN_SMTP_USER=user
-CKAN_SMTP_PASSWORD=pass
-CKAN_SMTP_MAIL_FROM=ckan@${PROXY_SERVER_NAME}
-CKAN_SMTP_REPLY_TO=''
-CKAN_EMAIL_TO=''
-CKAN_ERROR_EMAIL_FROM=''
+CKAN__ACTIVITY_STREAMS_EMAIL_NOTIFICATIONS=True
+CKAN___SMTP__ENABLED=True
+CKAN___SMTP__SERVER=mailserver:25
+CKAN___SMTP__STARTTLS=False
+CKAN___SMTP__USER=user
+CKAN___SMTP__PASSWORD=password
+CKAN___SMTP__MAIL_FROM=ckan@${PROXY_SERVER_NAME}
+CKAN___SMTP__REPLY_TO=ckan@${PROXY_SERVER_NAME}
+CKAN___EMAIL_TO=ckan@${PROXY_SERVER_NAME}
+CKAN___ERROR_EMAIL_FROM=''
+
 ## Customize which text formats the text_view plugin will show
 CKAN__PREVIEW__JSON_FORMATS="json jsonld"
 # html htm rdf+xml owl+xml xml n3 n-triples turtle plain atom csv tsv rss txt json

ckan/docker-entrypoint.d/01_setup_ckanext_config.sh

@@ -4,20 +4,6 @@
 echo "[docker-entrypoint.01_setup_ckanext_config] Clear index"
 ckan -c $CKAN_INI search-index clear
 
-# Add SMTP settings if CKAN_DOCKER_SMTP_ENABLED is True
-if [ "$CKAN_DOCKER_SMTP_ENABLED" = "True" ]; then
-    echo "[docker-entrypoint.01_setup_ckanext_config] Adding SMTP settings to the CKAN config file"
-    ckan config-tool $CKAN_INI \
-        "smtp.server=$CKAN_SMTP_SERVER" \
-        "smtp.starttls=$CKAN_SMTP_STARTTLS" \
-        "smtp.user=$CKAN_SMTP_USER" \
-        "smtp.password=$CKAN_SMTP_PASSWORD" \
-        "smtp.mail_from=$CKAN_SMTP_MAIL_FROM" \
-        "smtp.reply_to=$CKAN_SMTP_REPLY_TO" \
-        "email_to=$CKAN_EMAIL_TO" \
-        "error_email_from=$CKAN_ERROR_EMAIL_FROM"
-fi
-
 # Rebuild index
 echo "[docker-entrypoint.01_setup_ckanext_config] Rebuild index"
 ckan -c $CKAN_INI search-index rebuild

docker-compose.dev.yml

@@ -134,4 +134,11 @@ services:
           max-file: "10"
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "redis-cli", "-e", "QUIT"]
+      test: ["CMD", "redis-cli", "-e", "QUIT"]
+
+  #mailserver:
+  #  image: rnwood/smtp4dev
+  #  ports: 
+  #    - "1080:80"
+  #  restart: unless-stopped
+