From 3512bf9177256ecc4d84f42790dad0bf53a2e225 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 6 May 2015 23:05:51 +0200
Subject: [PATCH] readme, gitignore

---
 .gitignore                   | 1 +
 README.md                    | 5 +++++
 app/config/rsync_exclude.txt | 6 ++++++
 app/deploy                   | 4 ++--
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e6921c..8a993ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ composer.lock
 vendor/
 tags
 *.swp
+propel.yml
diff --git a/README.md b/README.md
index ae8a24c..67fb3f4 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,11 @@ Installation
 	$ cd gist
 	$ make
 
+Git
+---
+	$ git config --global user.email "you@example.com"
+	$ git config --global user.name "Your Name"
+
 Composer
 --------
 
diff --git a/app/config/rsync_exclude.txt b/app/config/rsync_exclude.txt
index 43b7b24..1defca2 100644
--- a/app/config/rsync_exclude.txt
+++ b/app/config/rsync_exclude.txt
@@ -3,5 +3,11 @@
 *.swp
 app/config/propel/
 app/propel/
+data/git
 deploy
+tags
 propel.yaml
+composer.lock
+composer.json
+bower.json
+.bowerrc
diff --git a/app/deploy b/app/deploy
index c3b74e3..932e1d4 100755
--- a/app/deploy
+++ b/app/deploy
@@ -3,12 +3,12 @@
 cd "$(dirname "$0")/.."
 
 deploy_preprod() {
-	rsync -avzoK --delete -e ssh * webgist@deblan.fr:/services/web/www/gist.deblan.org/
+	rsync -avzoK --delete -e ssh --exclude-from=app/config/rsync_exclude.txt * webgist@deblan.fr:/services/web/www/gist.deblan.org/
 }
 
 
 deploy_preprod_lan() {
-	rsync -avzoK --delete -e ssh * webgist@hinata:/services/web/www/gist.deblan.org/
+	rsync -avzoK --delete -e ssh --exclude-from=app/config/rsync_exclude.txt * webgist@hinata:/services/web/www/gist.deblan.org/
 }
 
 ([ -n "$1" ] && deploy_$1) || deploy_preprod