diff --git a/conf/vagrant/Vagrantfile b/conf/vagrant/Vagrantfile index 8bd3894..39c24b8 100644 --- a/conf/vagrant/Vagrantfile +++ b/conf/vagrant/Vagrantfile @@ -12,7 +12,9 @@ project = '@projectname@' hostname = "#{project}.local" extra_hostnames = [] -ansible_solr_enabled = @ansible_solr_enabled@ +# temporarily disable Solr support +#ansible_solr_enabled = @ansible_solr_enabled@ +ansible_solr_enabled = false ansible_https_enabled = @ansible_https_enabled@ ansible_project_web_root = "@ansible_project_web_root@" ansible_timezone = "America/Chicago" @@ -28,7 +30,7 @@ Vagrant.configure(2) do |config| config.vm.define "#{project}" do |box| box.vm.box = "palantir/drupalbox" - box.vm.box_version = ">= 0.2.4, < 1.0.0" + box.vm.box_version = "~> 1.1" box.vm.provider "vmware_fusion" do |v| v.vmx["memsize"] = "2048" diff --git a/conf/vagrant/provisioning/roles/php/tasks/main.yml b/conf/vagrant/provisioning/roles/php/tasks/main.yml index d115e0b..97e5352 100644 --- a/conf/vagrant/provisioning/roles/php/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/php/tasks/main.yml @@ -5,8 +5,8 @@ regexp='memory_limit' line='memory_limit = {{ item.value }}' with_items: - - { file: '/etc/php/5.6/apache2/php.ini', value: "{{ php_ini_memory_limit }}" } - - { file: '/etc/php/5.6/cli/php.ini', value: '-1' } + - { file: '/etc/php/7.0/fpm/php.ini', value: "{{ php_ini_memory_limit }}" } + - { file: '/etc/php/7.0/cli/php.ini', value: '-1' } tags: PHP - name: PHP | Enable PHP error display @@ -15,10 +15,10 @@ regexp='^{{ item.key }}' line='{{ item.key }} = {{ item.value }}' with_items: - - { file: '/etc/php/5.6/apache2/php.ini', key: 'error_reporting', value: "{{ php_ini_error_reporting }}" } - - { file: '/etc/php/5.6/apache2/php.ini', key: 'display_errors', value: "{{ php_ini_display_errors }}" } - - { file: '/etc/php/5.6/cli/php.ini', key: 'error_reporting', value: "{{ php_ini_error_reporting }}" } - - { file: '/etc/php/5.6/cli/php.ini', key: 'display_errors', value: "{{ php_ini_display_errors }}" } + - { file: '/etc/php/7.0/fpm/php.ini', key: 'error_reporting', value: "{{ php_ini_error_reporting }}" } + - { file: '/etc/php/7.0/fpm/php.ini', key: 'display_errors', value: "{{ php_ini_display_errors }}" } + - { file: '/etc/php/7.0/cli/php.ini', key: 'error_reporting', value: "{{ php_ini_error_reporting }}" } + - { file: '/etc/php/7.0/cli/php.ini', key: 'display_errors', value: "{{ php_ini_display_errors }}" } tags: PHP - name: PHP | Adjust php.ini upload_max_filesize @@ -27,6 +27,6 @@ regexp='^upload_max_filesize' line='upload_max_filesize = {{ php_ini_upload_max_filesize }}' with_items: - - /etc/php/5.6/apache2/php.ini - - /etc/php/5.6/cli/php.ini + - /etc/php/7.0/fpm/php.ini + - /etc/php/7.0/cli/php.ini tags: PHP diff --git a/conf/vagrant/provisioning/roles/solr/tasks/main.yml b/conf/vagrant/provisioning/roles/solr/tasks/main.yml index ad94e13..8e51ff5 100644 --- a/conf/vagrant/provisioning/roles/solr/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/solr/tasks/main.yml @@ -1,9 +1,9 @@ --- -- name: Solr | Disable Jetty Service +- name: Solr | Start the Jetty9 service become: true service: - name: jetty + name: jetty9 state: started enabled: yes when: solr_enabled == True