Compare commits
No commits in common. "2b5f8a088750838ccd2dff64d0d2cf35dc811e37" and "a1aff03e2d437c8376f8829e14d2d9ff7ec1509e" have entirely different histories.
2b5f8a0887
...
a1aff03e2d
13
.idea/.idea.MailcowBackup.dir/.idea/.gitignore
vendored
13
.idea/.idea.MailcowBackup.dir/.idea/.gitignore
vendored
@ -1,13 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
# Rider ignored files
|
|
||||||
/.idea.MailcowBackup.iml
|
|
||||||
/projectSettingsUpdater.xml
|
|
||||||
/modules.xml
|
|
||||||
/contentModel.xml
|
|
||||||
# Datasource local storage ignored files
|
|
||||||
/../../../../../../../../../:\Users\AsifB\Documents\RiderProjects\MailcowBackup\.idea\.idea.MailcowBackup.dir\.idea/dataSources/
|
|
||||||
/dataSources.local.xml
|
|
||||||
# Editor-based HTTP Client requests
|
|
||||||
/httpRequests/
|
|
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="CommitMessageInspectionProfile">
|
|
||||||
<profile version="1.0">
|
|
||||||
<inspection_tool class="BodyLimit" enabled="true" level="ERROR" enabled_by_default="true" />
|
|
||||||
<inspection_tool class="SubjectBodySeparation" enabled="true" level="ERROR" enabled_by_default="true" />
|
|
||||||
<inspection_tool class="SubjectLimit" enabled="true" level="ERROR" enabled_by_default="true" />
|
|
||||||
</profile>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
@ -83,7 +83,7 @@ cleanup() {
|
|||||||
else
|
else
|
||||||
printf "%s[%s] -- [INFO] 503 error page removed --%s\n" \
|
printf "%s[%s] -- [INFO] 503 error page removed --%s\n" \
|
||||||
"$cyan" "$(stamp)" "$norm" >> "$logFile"
|
"$cyan" "$(stamp)" "$norm" >> "$logFile"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
# cleanup SQL dump directory if created
|
# cleanup SQL dump directory if created
|
||||||
if [ "$sqlDumpDirCreated" -eq 1 ]; then
|
if [ "$sqlDumpDirCreated" -eq 1 ]; then
|
||||||
@ -251,7 +251,6 @@ logFile="$scriptPath/${scriptName%.*}.log"
|
|||||||
warnCount=0
|
warnCount=0
|
||||||
configDetails="$scriptPath/${scriptName%.*}.details"
|
configDetails="$scriptPath/${scriptName%.*}.details"
|
||||||
err503Copied=0
|
err503Copied=0
|
||||||
sqlDumpDirCreated=0
|
|
||||||
exclusions=0
|
exclusions=0
|
||||||
# borg output verbosity -- normal
|
# borg output verbosity -- normal
|
||||||
borgCreateParams='--stats'
|
borgCreateParams='--stats'
|
||||||
@ -420,7 +419,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
### read mailcow.conf and set vars as needed
|
### read mailcow.conf and set vars as needed
|
||||||
# shellcheck source=./mailcow.conf.shellcheck
|
|
||||||
. "$mcConfig"
|
. "$mcConfig"
|
||||||
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||||
export COMPOSE_HTTP_TIMEOUT="$dockerStartTimeout"
|
export COMPOSE_HTTP_TIMEOUT="$dockerStartTimeout"
|
||||||
@ -456,12 +454,10 @@ printf "%s[%s] -- [INFO] Using MAILCRYPT volume: %s --%s\n" \
|
|||||||
case "${configDetails}" in
|
case "${configDetails}" in
|
||||||
/*)
|
/*)
|
||||||
# absolute path, no need to rewrite variable
|
# absolute path, no need to rewrite variable
|
||||||
# shellcheck source=./backup.details
|
|
||||||
. "${configDetails}"
|
. "${configDetails}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
# relative path, prepend './' to create absolute path
|
# relative path, prepend './' to create absolute path
|
||||||
# shellcheck source=./backup.details
|
|
||||||
. "./${configDetails}"
|
. "./${configDetails}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -798,4 +794,4 @@ exit 0
|
|||||||
# 130: null configuration variable in details file
|
# 130: null configuration variable in details file
|
||||||
# 131: invalid configuration variable in details file
|
# 131: invalid configuration variable in details file
|
||||||
# 138: borg exited with a critical error
|
# 138: borg exited with a critical error
|
||||||
# 139: borg prune exited with a critical error
|
# 139: borg prune exited with a critical error
|
@ -1,66 +0,0 @@
|
|||||||
#
|
|
||||||
# sample mailcow configuration file
|
|
||||||
# (used by shellcheck)
|
|
||||||
#
|
|
||||||
|
|
||||||
MAILCOW_HOSTNAME=mail.example.com
|
|
||||||
|
|
||||||
DBNAME=mailcow
|
|
||||||
DBUSER=mailcow
|
|
||||||
DBPASS=verylongpassword
|
|
||||||
DBROOT=anotherlongpassword
|
|
||||||
|
|
||||||
HTTP_PORT=8080
|
|
||||||
HTTP_BIND=127.0.0.1
|
|
||||||
HTTPS_PORT=8443
|
|
||||||
HTTPS_BIND=127.0.0.1
|
|
||||||
|
|
||||||
SMTP_PORT=25
|
|
||||||
SMTPS_PORT=465
|
|
||||||
SUBMISSION_PORT=587
|
|
||||||
IMAP_PORT=143
|
|
||||||
IMAPS_PORT=993
|
|
||||||
POP_PORT=110
|
|
||||||
POPS_PORT=995
|
|
||||||
SIEVE_PORT=4190
|
|
||||||
DOVEADM_PORT=127.0.0.1:19991
|
|
||||||
SQL_PORT=127.0.0.1:13306
|
|
||||||
SOLR_PORT=127.0.0.1:18983
|
|
||||||
REDIS_PORT=127.0.0.1:7654
|
|
||||||
|
|
||||||
TZ=America/Edmonton
|
|
||||||
|
|
||||||
COMPOSE_PROJECT_NAME=mailcowdockerized
|
|
||||||
|
|
||||||
ACL_ANYONE=disallow
|
|
||||||
MAILDIR_GC_TIME=1440
|
|
||||||
ADDITIONAL_SAN=
|
|
||||||
SKIP_LETS_ENCRYPT=y
|
|
||||||
ENABLE_SSL_SNI=n
|
|
||||||
SKIP_IP_CHECK=n
|
|
||||||
SKIP_HTTP_VERIFICATION=n
|
|
||||||
SKIP_CLAMD=n
|
|
||||||
SKIP_SOGO=n
|
|
||||||
SKIP_SOLR=n
|
|
||||||
SOLR_HEAP=1024
|
|
||||||
USE_WATCHDOG=y
|
|
||||||
ALLOW_ADMIN_EMAIL_LOGIN=n
|
|
||||||
WATCHDOG_NOTIFY_EMAIL=a@example.com,b@example.com,c@example.com
|
|
||||||
WATCHDOG_NOTIFY_BAN=y
|
|
||||||
WATCHDOG_EXTERNAL_CHECKS=y
|
|
||||||
LOG_LINES=9999
|
|
||||||
|
|
||||||
IPV4_NETWORK=172.22.1
|
|
||||||
IPV6_NETWORK=fd4d:6169:6c63:6f77::/64
|
|
||||||
#SNAT_TO_SOURCE=
|
|
||||||
#SNAT6_TO_SOURCE=
|
|
||||||
|
|
||||||
#API_KEY=
|
|
||||||
#API_KEY_READ_ONLY=
|
|
||||||
#API_ALLOW_FROM=172.22.1.1,127.0.0.1
|
|
||||||
|
|
||||||
MAILDIR_SUB=Maildir
|
|
||||||
SOGO_EXPIRE_SESSION=480
|
|
||||||
DOVECOT_MASTER_USER=
|
|
||||||
DOVECOT_MASTER_PASS=
|
|
||||||
MAILCOW_PASS_SCHEME=BLF-CRYPT
|
|
Loading…
Reference in New Issue
Block a user