From 0d714dcec16d9d8760f6656d9be0b29964d51343 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Mon, 24 Apr 2017 15:51:44 -0400
Subject: fix some recurring vagrant issues with perms, and copy .git into vm

---
 vagrant_support/checksetup.yml | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'vagrant_support/checksetup.yml')

diff --git a/vagrant_support/checksetup.yml b/vagrant_support/checksetup.yml
index 5bac17662..6b54ef18d 100644
--- a/vagrant_support/checksetup.yml
+++ b/vagrant_support/checksetup.yml
@@ -1,8 +1,14 @@
 ---
-- name: bmo reconfiguration script
+- name: bmo checksetup script
   template:
-    src: bmo-reconfigure.j2
-    dest: /usr/local/bin/bmo-reconfigure
+    src: bmo-checksetup.j2
+    dest: /usr/local/bin/bmo-checksetup
+    mode: 0755
+
+- name: bmo generate data script
+  template:
+    src: bmo-generate-data.j2
+    dest: /usr/local/bin/bmo-generate-data
     mode: 0755
 
 - name: bmo checksetup answers
@@ -13,22 +19,11 @@
     group: vagrant
     mode: 0644
 
-- name: copy bmo config checker script
-  copy:
-    src: bmo-configured
-    dest: /usr/local/bin/bmo-configured
-    mode: 0755
-
-- name: 'check bmo config (failure is okay)'
-  shell: /usr/local/bin/bmo-configured
-  register: bmo_configured
-  ignore_errors: true
+- name: run checksetup
+  become: false
+  shell: sg apache -c '/usr/local/bin/bmo-checksetup'
 
-- name: configure bmo
+- name: generate data
   become: false
-  shell: sg apache -c '/usr/local/bin/bmo-reconfigure'
-  when: bmo_configured|failed
+  shell: sg apache -c '/usr/local/bin/bmo-generate-data'
 
-- name: check bmo config
-  shell: /usr/local/bin/bmo-configured
-  when: bmo_configured|failed
-- 
cgit v1.2.3-24-g4f1b