From 50f2d30c11f62318793a787f94c526bae9e80f61 Mon Sep 17 00:00:00 2001 From: byrond Date: Sat, 13 Oct 2018 16:31:54 -0400 Subject: [PATCH 1/5] provision gitconfig into the vm --- conf/vagrant/Vagrantfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/vagrant/Vagrantfile b/conf/vagrant/Vagrantfile index b3a43fa..f257c01 100644 --- a/conf/vagrant/Vagrantfile +++ b/conf/vagrant/Vagrantfile @@ -46,6 +46,8 @@ Vagrant.configure(2) do |config| box.ssh.forward_agent = true end + + config.vm.provision "file", source: "~/.gitconfig", destination: "$HOME/.gitconfig" config.vm.provision "the-vagrant", type: "ansible" do |ansible| ansible.playbook = "@playbook@" From 6bc225e94bab9f7d2a78cf8abc9ddf75327cb172 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Tue, 6 Nov 2018 08:51:13 -0500 Subject: [PATCH 2/5] rewrite gitconfig copied from host --- .../provisioning/roles/common/tasks/main.yml | 20 +++++++++++++++++++ .../roles/common/templates/gitconfig | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 conf/vagrant/provisioning/roles/common/templates/gitconfig diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index e918f43..9c7cb9e 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -13,6 +13,25 @@ - name: Common | Configure PALANTIR_ENVIRONMENT variable lineinfile: dest=/home/vagrant/.profile state=present line='export PALANTIR_ENVIRONMENT="vagrant"' tags: common + +- name: Common | Get user.name from host's gitconfig + git_config: + name: user.name + scope: global + register: git_author_name + tags: common + +- name: Common | Get user.email from host's gitconfig + git_config: + name: user.email + scope: global + register: git_author_email + tags: common + +- name: Common | Copy gitconfig from template + template: + src: gitconfig + dest: /home/vagrant/.gitconfig - name: Common | Copy gitignore copy: src=roles/common/templates/gitignore dest=/home/vagrant/.gitignore @@ -21,6 +40,7 @@ - name: Common | Configure global gitignore command: /usr/bin/git config --global core.excludesfile ~/.gitignore tags: common + - name: Check for user-specific provisioning script stat: path=/var/www/{{ hostname }}/conf/provision-user diff --git a/conf/vagrant/provisioning/roles/common/templates/gitconfig b/conf/vagrant/provisioning/roles/common/templates/gitconfig new file mode 100644 index 0000000..7740563 --- /dev/null +++ b/conf/vagrant/provisioning/roles/common/templates/gitconfig @@ -0,0 +1,4 @@ +# This is Git's per-user configuration file. +[user] + name = {{ git_author_name }} + email = {{ git_author_email }} From 91928d5ff821091dbd9af0d9082c7e9cc396ba20 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Tue, 6 Nov 2018 09:27:39 -0500 Subject: [PATCH 3/5] fix Ansible syntax errors and variable references --- conf/vagrant/provisioning/roles/common/tasks/main.yml | 4 ++-- conf/vagrant/provisioning/roles/common/templates/gitconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index 9c7cb9e..d3e0d08 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -18,14 +18,14 @@ git_config: name: user.name scope: global - register: git_author_name + register: git_author_name tags: common - name: Common | Get user.email from host's gitconfig git_config: name: user.email scope: global - register: git_author_email + register: git_author_email tags: common - name: Common | Copy gitconfig from template diff --git a/conf/vagrant/provisioning/roles/common/templates/gitconfig b/conf/vagrant/provisioning/roles/common/templates/gitconfig index 7740563..4746e4b 100644 --- a/conf/vagrant/provisioning/roles/common/templates/gitconfig +++ b/conf/vagrant/provisioning/roles/common/templates/gitconfig @@ -1,4 +1,4 @@ # This is Git's per-user configuration file. [user] - name = {{ git_author_name }} - email = {{ git_author_email }} + name = {{ git_author_name.config_value }} + email = {{ git_author_email.config_value }} From 83ffc8658d5ef94a555c304aa2ee4d0bf841fcc4 Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Tue, 6 Nov 2018 09:35:10 -0500 Subject: [PATCH 4/5] remove whitespace --- conf/vagrant/provisioning/roles/common/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index d3e0d08..ab7c783 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -40,7 +40,6 @@ - name: Common | Configure global gitignore command: /usr/bin/git config --global core.excludesfile ~/.gitignore tags: common - - name: Check for user-specific provisioning script stat: path=/var/www/{{ hostname }}/conf/provision-user From 447726cd70ab54266cf9d1fa6b7b8a0e4d4f50ef Mon Sep 17 00:00:00 2001 From: Byron Duvall Date: Wed, 21 Nov 2018 08:37:21 -0500 Subject: [PATCH 5/5] move gitconfig provisioning from Vagrantfile to ansible role --- conf/vagrant/Vagrantfile | 2 -- conf/vagrant/provisioning/roles/common/tasks/main.yml | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/vagrant/Vagrantfile b/conf/vagrant/Vagrantfile index f257c01..b3a43fa 100644 --- a/conf/vagrant/Vagrantfile +++ b/conf/vagrant/Vagrantfile @@ -46,8 +46,6 @@ Vagrant.configure(2) do |config| box.ssh.forward_agent = true end - - config.vm.provision "file", source: "~/.gitconfig", destination: "$HOME/.gitconfig" config.vm.provision "the-vagrant", type: "ansible" do |ansible| ansible.playbook = "@playbook@" diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index ab7c783..48d1078 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -13,7 +13,11 @@ - name: Common | Configure PALANTIR_ENVIRONMENT variable lineinfile: dest=/home/vagrant/.profile state=present line='export PALANTIR_ENVIRONMENT="vagrant"' tags: common - + +- name: Common | Copy user's gitconfig from host + copy: src=~/.gitconfig dest=/home/vagrant/.gitconfig + tags: common + - name: Common | Get user.name from host's gitconfig git_config: name: user.name