Permalink
Browse files

Moving some more of the setup to the config file.

  • Loading branch information...
1 parent 43293b0 commit 6957d3df929937bc6f1d7e5df251ebc8ac26908c @ibolmo committed Mar 9, 2012
Showing with 21 additions and 30 deletions.
  1. +0 −23 backup.sh
  2. +21 −0 config.sh.default
  3. +0 −7 restore.sh
View
@@ -9,29 +9,6 @@ fi
source ./config.sh
-# This needs to be a newline separated list of files and directories to backup
-INCLUDEFILES="./includes.txt"
-
-S3FILESYSLOCATION="s3+http://$(hostname)"
-S3MYSQLLOCATION="s3+http://$(hostname)"
-S3OPTIONS="--s3-use-new-style"
-
-EXTRADUPLICITYOPTIONS="-v8"
-
-FULLDAYS="14D"
-MAXFULL=2
-
-### MySQL Setup ###
-MUSER="<your mysql user>"
-MPASS="<mysql user's password>"
-MHOST="localhost"
-
-### Disable MySQL ###
-# Change to 0 to disable
-BACKUPMYSQL=0
-
-###### End Of Editable Parts ######
-
### Env Vars ###
PASSPHRASE_OLD="$(echo $PASSPHRASE)"
AWS_ACCESS_KEY_ID_OLD="$(echo $AWS_ACCESS_KEY_ID)"
View
@@ -3,3 +3,24 @@ PASSPHRASE=""
AWS_ACCESS_KEY_ID=""
AWS_SECRET_ACCESS_KEY=""
+# This needs to be a newline separated list of files and directories to backup
+INCLUDEFILES="./includes.txt"
+
+S3FILESYSLOCATION="s3+http://$(hostname)"
+S3MYSQLLOCATION="s3+http://$(hostname)"
+S3OPTIONS="--s3-use-new-style"
+
+EXTRADUPLICITYOPTIONS=""
+
+FULLDAYS="14D"
+MAXFULL=2
+
+### MySQL Setup ###
+MUSER="<your mysql user>"
+MPASS="<mysql user's password>"
+MHOST="localhost"
+
+### Disable MySQL ###
+# Change to 0 to disable
+BACKUPMYSQL=0
+
View
@@ -9,13 +9,6 @@ fi
source config.sh
-S3FILESYSLOCATION="s3+http://$(hostname)"
-S3OPTIONS="--s3-use-new-style"
-
-EXTRADUPLICITYOPTIONS=""
-
-###### End Of Editable Parts ######
-
### Env Vars ###
PASSPHRASE_OLD="$(echo $PASSPHRASE)"

0 comments on commit 6957d3d

Please sign in to comment.