From e59daaab3508c5462fa19bf2b8bcc4f5c69b333b Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Tue, 8 Jan 2019 12:12:27 -0500
Subject: [PATCH 1/2] Move variables to defaults/main.yml so they can be
 overridden if needed.

---
 defaults/main.yml | 25 +++++++++++++++++++++++++
 vars/main.yml     | 28 ----------------------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 0a6e5ba..dd8d49d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,6 +5,31 @@
 server_hostname: local.devshop.site
 devshop_devmaster_email: admin@local.devshop.site
 
+devshop_cli_repo: http://github.com/opendevshop/devshop.git
+devshop_cli_update: yes
+devshop_cli_path: /usr/share/devshop
+devshop_devmaster_path: "{{ aegir_user_home }}/devmaster-{{ devshop_version }}"
+
+devshop_makefile: "{{ devshop_cli_path }}/build-devmaster.make"
+devshop_install_profile: devmaster
+devshop_working_copy: --working-copy
+
+aegir_server_webserver: apache
+mysql_root_password_update: no
+
+aegir_db_host: localhost
+aegir_client_name: admin
+
+supervisor_running: yes
+
+drush_dl_method: wget
+
+devshop_drush_packages:
+  provision: 7.x-3.160
+  registry_rebuild: 7.x-2.2
+
+php_date_timezone: "America/New_York"
+
 # You should specify your own random mysql_root_password in your own playbooks or inventory.
 # mysql_root_password: PleaseRandomizeOnPlaybookRun
 
diff --git a/vars/main.yml b/vars/main.yml
index 5c51ef1..ed97d53 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,29 +1 @@
 ---
-# vars file for aegir.devmaster
-
-devshop_cli_repo: http://github.com/opendevshop/devshop.git
-devshop_cli_update: yes
-devshop_cli_path: /usr/share/devshop
-devshop_devmaster_path: "{{ aegir_user_home }}/devmaster-{{ devshop_version }}"
-
-devshop_makefile: "{{ devshop_cli_path }}/build-devmaster.make"
-devshop_install_profile: devmaster
-devshop_working_copy: --working-copy
-
-aegir_server_webserver: apache
-mysql_root_password_update: no
-
-aegir_db_host: localhost
-aegir_client_name: admin
-
-supervisor_running: yes
-
-#devmaster_install_command: "{{ local_bin_path }}/devshop devmaster:install --site={{ server_hostname }} --client_email={{ devshop_devmaster_email }} --devshop_version={{ devshop_version }} --aegir_db_pass={{ mysql_root_password }} --aegir_db_user={{ mysql_root_username }} --makefile={{ devshop_makefile }} --profile={{ devshop_install_profile }} --aegir_host={{ server_hostname }} --http_service_type={{ aegir_server_webserver }} --root=/var/aegir/devmaster-{{ devshop_version }} --drush-path={{ local_bin_path }}/drush {{ devshop_working_copy }} -n"
-
-drush_dl_method: wget
-
-devshop_drush_packages:
-  provision: 7.x-3.160
-  registry_rebuild: 7.x-2.2
-
-php_date_timezone: "America/New_York"

From f9f83f8c2db86be84b69eb2b76e949c7f8e0df36 Mon Sep 17 00:00:00 2001
From: Jon Pugh <jon@thinkdrop.net>
Date: Tue, 8 Jan 2019 12:14:51 -0500
Subject: [PATCH 2/2] Bump provision version to 1.7.0

---
 defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index dd8d49d..72d138b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -25,7 +25,7 @@ supervisor_running: yes
 drush_dl_method: wget
 
 devshop_drush_packages:
-  provision: 7.x-3.160
+  provision: 7.x-3.170
   registry_rebuild: 7.x-2.2
 
 php_date_timezone: "America/New_York"