mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-19 11:14:06 +00:00
Configurations cleanup & database configurations for mail and pdfs (#479)
* Move Mail, PDF configuration to Database, standardize configurations * Set default currency to USD on install * Pint code
This commit is contained in:
committed by
GitHub
parent
3da86965e1
commit
18d63a3375
@@ -46,13 +46,6 @@ services:
|
||||
- SESSION_LIFETIME=240
|
||||
- SESSION_DOMAIN=localhost
|
||||
- SANCTUM_STATEFUL_DOMAINS=localhost:8090
|
||||
#- MAIL_MAILER=smtp
|
||||
#- MAIL_HOST=smtp.mailtrap.io
|
||||
#- MAIL_PORT=2525
|
||||
#- MAIL_USERNAME=null
|
||||
#- MAIL_PASSWORD=null
|
||||
#- MAIL_PASSWORD_FILE=<filename>
|
||||
#- MAIL_ENCRYPTION=null
|
||||
volumes:
|
||||
- invoiceshelf_storage:/var/www/html/storage/
|
||||
ports:
|
||||
|
||||
@@ -27,13 +27,6 @@ services:
|
||||
- SESSION_LIFETIME=240
|
||||
- SESSION_DOMAIN=localhost
|
||||
- SANCTUM_STATEFUL_DOMAINS=localhost:8090
|
||||
#- MAIL_DRIVER=smtp
|
||||
#- MAIL_HOST=smtp.mailtrap.io
|
||||
#- MAIL_PORT=2525
|
||||
#- MAIL_USERNAME=null
|
||||
#- MAIL_PASSWORD=null
|
||||
#- MAIL_PASSWORD_FILE=<filename>
|
||||
#- MAIL_ENCRYPTION=null
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
invoiceshelf:
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
|
||||
|
||||
#!/bin/bash
|
||||
function replace_or_insert() {
|
||||
# Voodoo magic: https://superuser.com/a/976712
|
||||
@@ -71,36 +69,6 @@ fi
|
||||
if [ "$BROADCAST_CONNECTION" != '' ]; then
|
||||
replace_or_insert "BROADCAST_CONNECTION" "$BROADCAST_CONNECTION"
|
||||
fi
|
||||
if [ "$MAIL_DRIVER" != '' ]; then
|
||||
replace_or_insert "MAIL_MAILER" "$MAIL_DRIVER"
|
||||
fi
|
||||
if [ "$MAIL_MAILER" != '' ]; then
|
||||
replace_or_insert "MAIL_MAILER" "$MAIL_MAILER"
|
||||
fi
|
||||
if [ "$MAIL_HOST" != '' ]; then
|
||||
replace_or_insert "MAIL_HOST" "$MAIL_HOST"
|
||||
fi
|
||||
if [ "$MAIL_PORT" != '' ]; then
|
||||
replace_or_insert "MAIL_PORT" "$MAIL_PORT"
|
||||
fi
|
||||
if [ "$MAIL_USERNAME" != '' ]; then
|
||||
replace_or_insert "MAIL_USERNAME" "$MAIL_USERNAME"
|
||||
fi
|
||||
if [ "$MAIL_PASSWORD" != '' ]; then
|
||||
replace_or_insert "MAIL_PASSWORD" "$MAIL_PASSWORD"
|
||||
elif [ "$MAIL_PASSWORD_FILE" != '' ]; then
|
||||
value=$(<$MAIL_PASSWORD_FILE)
|
||||
replace_or_insert "MAIL_PASSWORD" "$value"
|
||||
fi
|
||||
if [ "$MAIL_SCHEME" != '' ]; then
|
||||
replace_or_insert "MAIL_SCHEME" "$MAIL_SCHEME"
|
||||
fi
|
||||
if [ "$MAIL_FROM_NAME" != '' ]; then
|
||||
replace_or_insert "MAIL_FROM_NAME" "$MAIL_FROM_NAME"
|
||||
fi
|
||||
if [ "$MAIL_FROM_ADDRESS" != '' ]; then
|
||||
replace_or_insert "MAIL_FROM_ADDRESS" "$MAIL_FROM_ADDRESS"
|
||||
fi
|
||||
if [ "$TRUSTED_PROXIES" != '' ]; then
|
||||
replace_or_insert "TRUSTED_PROXIES" "$TRUSTED_PROXIES"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user