From 0199148aec33f8082f2e86283ce80053787ede75 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 2 Feb 2016 19:31:22 +0100
Subject: [PATCH] Deployment

---
 .gitignore                             |  2 ++
 .mage/config/environment/.gitignore    |  0
 .mage/config/environment/prod.yml-dist | 27 ++++++++++++++++++++++++++
 .mage/config/general.yml               |  7 +++++++
 .mage/logs/.gitignore                  |  2 ++
 .mage/tasks/.gitignore                 |  0
 Makefile                               |  1 -
 README.md                              | 15 ++++++++++++++
 app/config/rsync_exclude.txt           | 13 -------------
 app/deploy                             | 14 -------------
 10 files changed, 53 insertions(+), 28 deletions(-)
 create mode 100644 .mage/config/environment/.gitignore
 create mode 100644 .mage/config/environment/prod.yml-dist
 create mode 100644 .mage/config/general.yml
 create mode 100644 .mage/logs/.gitignore
 create mode 100644 .mage/tasks/.gitignore
 delete mode 100644 app/config/rsync_exclude.txt
 delete mode 100755 app/deploy

diff --git a/.gitignore b/.gitignore
index 8a993ec..609304f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.mage/config/environment/*.yml
+.mage/logs/*.log
 composer.lock
 vendor/
 tags
diff --git a/.mage/config/environment/.gitignore b/.mage/config/environment/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/.mage/config/environment/prod.yml-dist b/.mage/config/environment/prod.yml-dist
new file mode 100644
index 0000000..83aaeee
--- /dev/null
+++ b/.mage/config/environment/prod.yml-dist
@@ -0,0 +1,27 @@
+# prod
+# Rename this file to "prod.yml"
+deployment:
+    user: gist
+    from: ./
+    to: /var/www/gist/
+    excludes:
+        - "*.svn"
+        - "*.git"
+        - "*.swp"
+        - "app/config/propel/"
+        - "app/propel/"
+        - "data/git"
+        - "deploy"
+        - "tags"
+        - "propel.yaml"
+        - "composer.lock"
+        - "composer.json"
+        - "bower.json"
+        - ".bowerrc"
+hosts:
+    - gist.mycompany.com
+tasks:
+    pre-deploy:
+    on-deploy:
+    post-deploy:
+verbose_logging: true
diff --git a/.mage/config/general.yml b/.mage/config/general.yml
new file mode 100644
index 0000000..cff23fa
--- /dev/null
+++ b/.mage/config/general.yml
@@ -0,0 +1,7 @@
+# global settings
+name: Gist
+email: 
+notifications: false
+logging: true
+maxlogs: 30
+ssh_needs_tty: false
diff --git a/.mage/logs/.gitignore b/.mage/logs/.gitignore
new file mode 100644
index 0000000..c96a04f
--- /dev/null
+++ b/.mage/logs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/.mage/tasks/.gitignore b/.mage/tasks/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
index e68115a..7dd29cc 100644
--- a/Makefile
+++ b/Makefile
@@ -52,4 +52,3 @@ propel:
 	./vendor/propel/propel/bin/propel model:build --recursive
 	./vendor/propel/propel/bin/propel migration:diff --recursive
 	./vendor/propel/propel/bin/propel migration:migrate --recursive
-	./vendor/propel/propel/bin/propel model:build --recursive
diff --git a/README.md b/README.md
index 71406e3..b48e5c0 100644
--- a/README.md
+++ b/README.md
@@ -207,3 +207,18 @@ Edit `app/bootstrap.php.d/70-security.php` and modify the value of `$app['enable
 ### Debug
 
 `app_dev.php` is the development router. Access is granted for an IP range defined in the same file.
+
+
+Deployment
+----------
+
+Gist uses [Magallanes](http://magephp.com/) to mange deployment. 
+	
+	$ composer global require andres-montanez/magallanes
+	$ # if the envvar PATH contains "$HOME/bin/"
+	$ ln -s ~/.composer/vendor/bin/mage ~/bin/mage
+
+There is an example of the configuration of an environment in `.mage/config/environment/prod.yml-dist`.
+
+	$ mage deploy to:prod
+
diff --git a/app/config/rsync_exclude.txt b/app/config/rsync_exclude.txt
deleted file mode 100644
index 1defca2..0000000
--- a/app/config/rsync_exclude.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-*.svn
-*.git
-*.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
deleted file mode 100755
index 932e1d4..0000000
--- a/app/deploy
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-cd "$(dirname "$0")/.."
-
-deploy_preprod() {
-	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 --exclude-from=app/config/rsync_exclude.txt * webgist@hinata:/services/web/www/gist.deblan.org/
-}
-
-([ -n "$1" ] && deploy_$1) || deploy_preprod