From b732fe1ecef1173724e6fca02df3baaefc93052f Mon Sep 17 00:00:00 2001 From: deajan Date: Sat, 12 Nov 2016 00:30:42 +0100 Subject: [PATCH] Updated sync.conf comments --- sync.conf.example | 10 ++++++++-- upgrade-v1.0x-v1.2x.sh | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sync.conf.example b/sync.conf.example index a4e6ec4..d4933c0 100644 --- a/sync.conf.example +++ b/sync.conf.example @@ -2,7 +2,7 @@ ###### osync - Rsync based two way sync engine with fault tolerance ###### (C) 2013-2016 by Orsiris de Jong (www.netpower.fr) -###### osync v1.1x / v1.2x config file rev 2016102101 +###### osync v1.1x / v1.2x config file rev 2016111201 ## ---------- GENERAL OPTIONS @@ -154,9 +154,15 @@ DELTA_COPIES=yes ## ---------- ALERT OPTIONS ## List of alert mails separated by spaces +## Most Unix systems have preconfigured mail support and don't need anything else than the destination mail +## Just make sure that the current user has enough privileges to use mail / mutt / sendmail +## on pfSense platform, smtp support needs to be configured in System > Advanced > Notifications DESTINATION_MAILS="your@alert.tld" -## Windows specific (msys / cygwin environment) only mail options (used with mailsend.exe from muquit, http://github.com/muquit/mailsend or from sendemail.exe from Brandon Zehm, http://caspian.dotconf.net/menu/Software/SendEmail/) +## Busybox / Windows specific (msys / cygwin environment) only mail options +## Busybox relies on sendmail +## Windows mail support relies on mailsend.exe from muquit, http://github.com/muquit/mailsend which needs to be in %PATH% environment variable + SENDER_MAIL="alert@your.system.tld" SMTP_SERVER=smtp.your.isp.tld SMTP_PORT=25 diff --git a/upgrade-v1.0x-v1.2x.sh b/upgrade-v1.0x-v1.2x.sh index aa62f0c..8ba8bfe 100755 --- a/upgrade-v1.0x-v1.2x.sh +++ b/upgrade-v1.0x-v1.2x.sh @@ -6,7 +6,7 @@ AUTHOR="(C) 2016 by Orsiris de Jong" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" OLD_PROGRAM_VERSION="v1.0x-v1.1x" NEW_PROGRAM_VERSION="v1.2x" -CONFIG_FILE_VERSION=2016102101 +CONFIG_FILE_VERSION=2016111201 PROGRAM_BUILD=2016101701 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode