Install solr as the vagrant user

palantirnet · Feb 12, 2020 · 0e6117e · 0e6117e
1 parent a5ffbd1
commit 0e6117e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/drupalbox/drupalbox.json b/drupalbox/drupalbox.json
@@ -199,17 +199,10 @@
       "galaxy_file": "drupalbox/requirements.yml",
       "inventory_groups": "drupalbox,all"
     },
-    {
-      "type": "shell",
-      "script": "script/reboot.sh",
-      "execute_command": "echo '{{ user `ssh_password` }}' | {{.Vars}} sudo -E -S bash '{{.Path}}'",
-      "expect_disconnect": true
-    },
     {
         "type": "file",
         "source": "tests",
-        "destination": "/tmp",
-        "pause_before": "60s"
+        "destination": "/tmp"
     },
     {
         "type": "file",

diff --git a/drupalbox/drupalbox.yml b/drupalbox/drupalbox.yml
@@ -32,6 +32,7 @@
         role: geerlingguy.solr,
         solr_version: "7.7.2",
         solr_cores: ['example'],
+        solr_user: vagrant,
         become: yes
       }
     - {

diff --git a/drupalbox/tests/solr_spec.rb b/drupalbox/tests/solr_spec.rb
@@ -18,8 +18,8 @@
 
 describe file("/var/solr/logs/solr.log") do
   it { should be_file }
-  it { should be_owned_by 'solr' }
-  it { should be_grouped_into 'solr' }
+  it { should be_owned_by 'vagrant' }
+  it { should be_grouped_into 'vagrant' }
 end
 
 describe service('solr') do

diff --git a/provisioning/roles/solr-configuration/tasks/main.yml b/provisioning/roles/solr-configuration/tasks/main.yml
@@ -1,10 +1,5 @@
 ---
 
-- name: Solr Configuration | Grant the vagrant user access to Solr configs
-  user:
-    name: vagrant
-    groups: solr
-
 - name: Solr Configuration | Copy Solr config
   copy:
     src: templates/
@@ -15,12 +10,12 @@
     cmd: /opt/solr/bin/solr create_core -c drupal8 -d /tmp/solr_7.x_config-drupal8
     creates: /var/solr/data/drupal8
   become: yes
-  become_user: solr
+  become_user: vagrant
 
 # Drupal 7 support requires different Lucene configuration.
 - name: Solr Configuration | Install 'drupal7' Solr core
   command:
     cmd: /opt/solr/bin/solr create_core -c drupal7 -d /tmp/solr_7.x_config-drupal7
     creates: /var/solr/data/drupal7
   become: yes
-  become_user: solr
+  become_user: vagrant