Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hi! We cleaned up your code for you! #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
*.pyc

# Logs and databases #
######################
*.log

# OS generated files #
######################
.DS_Store*
ehthumbs.db
Icon?
Thumbs.db
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ License: [GNU General Public License v3][1]
Additional Information
---------

Further information including basic and more advanced usage is available from the following URL:
Further information including basic and more advanced usage is available from the following URL:
<http://www.lbackup.org>

If you wish to build an OS X package installer then the following project will be of interest :
If you wish to build an OS X package installer then the following project will be of interest :
<http://www.github.com/henri/lbackup_install_osx>

If you wish to build a .deb installer for use on debian based operating systems then the following project will be of interest :
If you wish to build a .deb installer for use on debian based operating systems then the following project will be of interest :
<http://www.github.com/henri/lbackup_install_debian>

Instructions for installing directly from source are available from the following URL :
Instructions for installing directly from source are available from the following URL :
<http://www.lbackup.org/source>


Expand Down
8 changes: 4 additions & 4 deletions etc/lbackup/example_backup_config/README.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

It is strongly recommended that you check the documentation available from the following URL for information regarding the installation and use of LBACKUP.

LBackup Home (online documentation) :
LBackup Home (online documentation) :
http://www.lbackup.org

For instructions on setting up your first test backup visit :
For instructions on setting up your first test backup visit :
http://lucidsystems.org/tools/lbackup/instructions/setup

To signup to the LBackup mailing lists vista the URL below:
To signup to the LBackup mailing lists vista the URL below:
http://www.lucidsystems.org/tools/lbackup/lists/

Lucid offers information storage and processing consultation and support services. Including support for LBackup :
Lucid offers information storage and processing consultation and support services. Including support for LBackup :
http://www.lucidsystems.org

LBackup uses rsync to copy and compare files. It is important that the copy of rsync installed and referenced by LBackup supports coping metadata which you or your policies require. Check the online documentation for the latest information regarding compiling and installing rsync, particularly if you are running Mac OS X. Also note that many versions of rsync which are available do not work correctly with symbolic links. Ensure that your version is working if you have symbolic links in your backup tree.
Expand Down
70 changes: 35 additions & 35 deletions etc/lbackup/example_backup_config/example_backup.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
##################################################


##################################################
##################################################
## ##
## The origional developer of this software ##
## maintains rights as specified in the ##
Expand All @@ -37,10 +37,10 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
# Backup should be called as listed below :
# eg . /usr/local/sbin/lbackup /path/to/this/script.conf
#
# This configuration file requires
# This configuration file requires
# LBackup version 0.9.8r5 or later.
#
# For a less complex example backup configuration file visit :
# For a less complex example backup configuration file visit :
# http://lucidsystems.org/tools/lbackup/instructions/setup
#

Expand All @@ -58,20 +58,20 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin



# Is the source for this backup located on a remote machine accessed via SSH (YES/NO)
# Is the source for this backup located on a remote machine accessed via SSH (YES/NO)
useSSH="YES"



# Power management Settings
# MAC address of machine to be woken
hardware_address="00:03:93:B0:A0:BA"
# determines weather or not to wake/sleep the client machine on the LAN (YES/NO)
# determines weather or not to wake/sleep the client machine on the LAN (YES/NO)
WAKE="NO"
SLEEP="NO"


# Send Growl Notification (YES/NO)
# Send Growl Notification (YES/NO)
sendGrowlNotification="NO"


Expand All @@ -92,10 +92,10 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
excludes_filename=excludes.txt


## Availability Tests (YES/NO)
## Availability Tests (YES/NO)
SSHTest="YES"
PingTest="NO"




Expand All @@ -115,7 +115,7 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
# the oldest backup snapshot and also any failed backup (YES/NO)
# report_removal_times_human_readable="YES"

## Report in a (human readable format) the amount of time required for rsync
## Report in a (human readable format) the amount of time required for rsync
# to complete the rsync snapshot (YES/NO)
# report_snapshot_time_human_readable="YES"

Expand All @@ -128,8 +128,8 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin

# Name of the associated mail config file (file needs to be in same directory)
mailconfigpartner=example_mail.conf
# Send an email even if the backup is successful. (YES/NO)

# Send an email even if the backup is successful. (YES/NO)
# Notes : Be warned if you have a lot of backups then you do not want to enable this.
# Consider running lmail on a schedule or have a look at the lbackup home
# and search for "monitoring multiple backup logs". This option will forward
Expand All @@ -141,30 +141,30 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
# Disable the sending of email reports / alerts (YES/NO)
# Notes : This option is experimental and may be removed from future releases.
# Enabling this option will mean that you disable the sending of email.
# Enabling this option is not compatible with when the option
# Enabling this option is not compatible with when the option
# email_and_archive_log_on_successful_backup is enabled.
# disable_mailconfigpartner="NO"





##
## Change Logging ( requires rsync version 3 or later - experimental options)
## Change Logging ( requires rsync version 3 or later - experimental options)
##

# List changes in the standard log file (YES/NO)
# Note : This feature is experimental.
itemize_changes_to_standard_log="NO"

# List changes in a separate log file (YES/NO)
# Note: If you would like to see which files are changing during a
# backup then this is the recommended method. If enabled file
# called "rsync_session.log" will be created within your
# configuration directory. This file will contain a list of
# backup then this is the recommended method. If enabled file
# called "rsync_session.log" will be created within your
# configuration directory. This file will contain a list of
# changes as well as additional rsync information. This file
# can easily grow very large. Therefore, if this option is
# enabled it is recommended that this file is removed or
# enabled it is recommended that this file is removed or
# archived by a pre or post action script.
enable_rsync_session_log="NO"

Expand All @@ -174,11 +174,11 @@ enable_rsync_session_log="NO"


##
## Backup Lock Override (experimental option - may be removed from future version)
## Backup Lock Override (experimental option - may be removed from future version)
##

# Note : This feature is experimental. Only enable if you are sure that an override is required.
# You may want to enable this feature if the user executing the backup dose not have
# You may want to enable this feature if the user executing the backup dose not have
# write access to the backup directory. Future versions of LBackup may offer the
# option of specifying the absolute lock file path from within the configuration
# file.
Expand Down Expand Up @@ -218,7 +218,7 @@ enable_rsync_session_log="NO"


##
## LBackup Rsync Options
## LBackup Rsync Options
##

# If you are using Mac OS X on both the client and server then you should
Expand All @@ -227,18 +227,18 @@ enable_rsync_session_log="NO"
# these options may change in future LBackup releases.

# Override Rsync Path when backup occurs via SSH (eg. /usr/bin/rsync)

#ssh_rsync_path_remote="/usr/bin/rsync" # ( Use standard version of Rsync - LINUX - Client )
#ssh_rsync_path_local="/usr/bin/rsync" # ( Use standard version of Rsync - LINUX - Server )

#ssh_rsync_path_remote="/usr/local/bin/rsync_v3" # ( Use custom version of rsync - OSX - Client)
#ssh_rsync_path_local="/usr/local/bin/rsync_v3" # ( Use custom version of rsync - OSX - Server)


# Use this custom rsync path if we are performing a local backup on Darwin
# custom_rsync_path_local_darwin="/usr/local/bin/rsync_v3"


# Override local system checks (YES/NO)
#check_local_system="NO" # (Bypasses the local system checks)

Expand Down Expand Up @@ -267,13 +267,13 @@ enable_rsync_session_log="NO"
########################### EXPORT-START ############################


## EXPORT SETTINGS
## EXPORT SETTINGS
export backupConfigurationVersion
export sshRemoteUser
export sshRemoteServer
export hardware_address
export sendGrowlNotification
export WAKE
export WAKE
export SLEEP
export backupDest
export log_fileName
Expand Down
18 changes: 9 additions & 9 deletions etc/lbackup/example_backup_config/example_mail.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ PATH=/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
## http://www.lbackup.org ##
## ##
## ##
##################################################
##################################################


##################################################
##################################################
## ##
## The origional developer of this software ##
## The origional developer of this software ##
## maintains rights as specified in the ##
## Lucid Terms and Conditions available from ##
## http://www.lucidsystems.org ##
## ##
##################################################
##################################################


##################################################
#
# This is a configuration file for the Mail
# component of the lbackup system. This is a
# component of the lbackup system. This is a
# configuration file for the lmail component.
# This script should be called as listed below.
# eg . /usr/local/sbin/lmail /path/to/this/script.conf
Expand Down Expand Up @@ -72,15 +72,15 @@ sshUser="mail"
sshServer="192.168.0.1"

# Backup Report Identifier - String included in the body of report
backup_identity="Important Files From The Office Server - DAILY"
backup_identity="Important Files From The Office Server - DAILY"

# Log File Archive
logFileArchive_name="log_archive"


# Search for custom mail templates directory "message_templates" and files.
# This feature is experimental and may be altered or removed in a future
# release. Finally, enabling this feature has the potential to
# release. Finally, enabling this feature has the potential to
# significantly reduce the reliability of email reporting.
enableCustomMailTemplates="NO"

Expand Down Expand Up @@ -108,13 +108,13 @@ mail_post_action_script=""

########################## EXPORT-START #############################

## EXPORT SETTINGS
## EXPORT SETTINGS
export mailConfigurationVersion
export messageRecipient
export messageFromName
export messageFromAddress
export logFile_name
export mailsystem
export mailsystem
export sshUser
export sshServer
export backup_identity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
## ##
## Lucid Inormatin Systems. ##
## ##
## The developer of this software ##
## The developer of this software ##
## maintains rights as specified in the ##
## Lucid Terms and Conditions availible from ##
## www.lucidsystems.org ##
## ##
##################################################
##################################################



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# Description
#
# Mounts a remote area via SFTP
# Mounts a remote area via SFTP
# Desinged for backup purposes
# Requires MacFuse and SSHFS
#
Expand All @@ -39,7 +39,7 @@ mount_point="/Volumes/${volume_name}"
alternate_backup_device="/Volumes/BigDisk"


# Internal Varibles :
# Internal Varibles :

SSHFS=/usr/local/bin/sshfs
mount_point_created="NO"
Expand Down Expand Up @@ -67,7 +67,7 @@ check_for_local_backup_devices

# Mount some SFTP points mounting with FUSE!

if ! [ -d ${mount_point} ] ; then
if ! [ -d ${mount_point} ] ; then

# Create the mount point
mkdir ${mount_point}
Expand All @@ -77,7 +77,7 @@ if ! [ -d ${mount_point} ] ; then
else
mount_point_created="YES"
fi

# connect to the mount point using SSHFS
$SSHFS ${ssh_user_name}@${ssh_server}:${ssh_remote_directory} ${mount_point} -oreconnect,ping_diskarb,volname=${volume_name}
if [ $? != 0 ] ; then
Expand All @@ -88,7 +88,7 @@ if ! [ -d ${mount_point} ] ; then
fi
fi
echo " ERROR! : Mounting via SSH" | tee -ai $logFile
exit -1
exit -1
fi
sleep 25
else
Expand Down
Loading