From 3217d282ccd1e4bcb8d5be4b2eb47bd822df1e66 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sat, 21 Jan 2017 10:11:36 +0300
Subject: [PATCH] Change deploy configuration

Add hosts variables for prod configuration
---
 Makefile             | 4 ++--
 ansible/deploy.yml   | 7 +++++--
 ansible/hosts_prod   | 1 +
 ansible/rollback.yml | 4 ++--
 ansible/vars/all.yml | 9 +--------
 5 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 ansible/hosts_prod

diff --git a/Makefile b/Makefile
index ddee13c..c2424c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 deploy:
 	vendor/bin/sculpin generate --env=prod
-	ansible-playbook --inventory 'anwinged.ru,' --user=deployer ansible/deploy.yml
+	ansible-playbook --inventory "ansible/hosts_prod" --user=deployer ansible/deploy.yml
 
 rollback:
-	ansible-playbook --inventory 'anwinged.ru,' --user=deployer ansible/rollback.yml
+	ansible-playbook --inventory "ansible/hosts_prod" --user=deployer ansible/rollback.yml
diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 719309d..e6f3105 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -2,8 +2,11 @@
 - name: Deploy homepage
   hosts: all
 
-  vars_files:
-    - vars/all.yml
+  vars:
+    ansistrano_deploy_from: "{{ playbook_dir }}/../output_prod/"
+    ansistrano_deploy_to: "{{ application_root }}"
+    ansistrano_keep_releases: 3
+    ansistrano_deploy_via: rsync
 
   roles:
     - carlosbuenosvinos.ansistrano-deploy
diff --git a/ansible/hosts_prod b/ansible/hosts_prod
new file mode 100644
index 0000000..c572348
--- /dev/null
+++ b/ansible/hosts_prod
@@ -0,0 +1 @@
+anwinged.ru application_root=/var/www/anwinged
diff --git a/ansible/rollback.yml b/ansible/rollback.yml
index ec46188..c4587eb 100644
--- a/ansible/rollback.yml
+++ b/ansible/rollback.yml
@@ -2,8 +2,8 @@
 - name: Rollback homepage
   hosts: all
 
-  vars_files:
-    - vars/all.yml
+  vars:
+    ansistrano_deploy_to: "{{ application_root }}"
 
   roles:
     - carlosbuenosvinos.ansistrano-rollback
diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml
index d19d0b3..f5a3725 100755
--- a/ansible/vars/all.yml
+++ b/ansible/vars/all.yml
@@ -20,11 +20,4 @@ php_packages:
   - php7.1-mbstring
   - php7.1-intl
   - php7.1-curl
-  - php7.1-xml 
-
-# Vars for ansistrano
-
-ansistrano_deploy_from: "{{ playbook_dir }}/../output_prod/"
-ansistrano_deploy_to: "/var/www/{{ site.www_dir }}"
-ansistrano_keep_releases: 3
-ansistrano_deploy_via: rsync
+  - php7.1-xml