Fixup config

Author: joecorall

Dockerfile

@@ -70,6 +70,8 @@ ENV \
     OJS_ENABLE_BEACON=1 \
     OJS_SESSION_LIFETIME=30 \
     OJS_X_FORWARDED_FOR=Off \
+    OJS_SMTP_SERVER= \
+    OJS_SMTP_PORT=25 \
     # see https://github.com/Islandora-Devops/isle-buildkit/tree/main/nginx#nginx-settings
     PHP_MAX_EXECUTION_TIME=300 \
     PHP_MAX_INPUT_TIME=300 \

docker-compose.yaml

@@ -35,8 +35,9 @@ services:
     ports:
       - 80:80
     environment:
-      OJS_OAI_REPOSITORY_ID: ojs.localhost
+      OJS_OAI_REPOSITORY_ID: ${DOMAIN:-localhost}
       OJS_ENABLE_BEACON: 1
+      OJS_SMTP_SERVER: ${OJS_SMTP_SERVER:-}
     secrets:
       - source: DB_ROOT_PASSWORD
       - source: OJS_API_KEY_SECRET

rootfs/etc/confd/templates/config.inc.tmpl

@@ -304,19 +304,15 @@ allowed_title_html = "b,i,u,sup,sub"
 
 [email]
 
-; Default method to send emails
-; Available options: sendmail, smtp, log, phpmailer
+{{ if getenv "OJS_SMTP_SERVER" }}
+default = smtp
+smtp = On
+smtp_server = {{ getenv "OJS_SMTP_SERVER" }}
+smtp_port = {{ getenv "OJS_SMTP_PORT" }}
+{{ else }}
 default = sendmail
-
-; Path to the sendmail, -bs argument is for using SMTP protocol
 sendmail_path = "/usr/sbin/sendmail -bs"
-
-; Use SMTP for sending mail instead of mail()
-; smtp = On
-
-; SMTP server settings
-; smtp_server = mail.example.com
-; smtp_port = 25
+{{ end }}
 
 ; Enable SMTP authentication
 ; Supported smtp_auth: ssl, tls (see PHPMailer SMTPSecure)
@@ -358,7 +354,7 @@ sendmail_path = "/usr/sbin/sendmail -bs"
 ; dmarc_compliant_from_displayname = '%n via %s'
 
 ; If enabled, email addresses must be validated before login is possible.
-require_validation = Off
+require_validation = On
 
 ; The number of days a user has to validate their account before their access key expires.
 validation_timeout = 14

rootfs/etc/nginx/shared/ojs.conf

@@ -26,7 +26,8 @@ location ~ \.php(/|$) {
     }
 
     fastcgi_pass unix:/var/run/php-fpm83/php-fpm83.sock;
-
+    fastcgi_param HTTPS on;
+    fastcgi_param HTTP_SCHEME https;
     fastcgi_index index.php;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     fastcgi_param PATH_INFO $fastcgi_path_info;

scripts/generate-secrets.sh

@@ -16,4 +16,3 @@ yq -r '.secrets[].file' docker-compose.yaml | uniq | while read -r SECRET; do
     (grep -ao "${CHARACTERS}" < /dev/urandom || true) | head "-${LENGTH}" | tr -d '\n' > "${SECRET}"
   fi
 done
-