Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit d0cd395

Browse files
committed
Use composer project based site build as the default
1 parent d828f77 commit d0cd395

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

default.config.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,21 @@ drupalvm_webserver: apache
3737

3838
# Set this to 'false' if you are using a different site deployment strategy and
3939
# would like to configure 'vagrant_synced_folders' and 'apache_vhosts' manually.
40-
build_makefile: true
40+
build_makefile: false
4141
drush_makefile_path: "{{ config_dir }}/drupal.make.yml"
4242

4343
# Set 'build_makefile' to 'false' and this to 'true' if you are using a
4444
# composer based site deployment strategy.
4545
build_composer: false
4646
drupal_composer_path: "{{ config_dir }}/drupal.composer.json"
4747
drupal_composer_install_dir: "/var/www/drupalvm/drupal"
48-
drupal_composer_dependencies: []
48+
drupal_composer_dependencies:
49+
- "drupal/devel:8.*"
4950

5051
# Set this to 'true' and 'build_makefile', 'build_composer' to 'false' if you
5152
# are using Composer's create-project as a site deployment strategy.
52-
build_composer_project: false
53-
drupal_composer_project_package: ""
53+
build_composer_project: true
54+
drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
5455
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
5556

5657
# Set this to 'false' if you don't need to install drupal (using the drupal_*
@@ -59,7 +60,7 @@ install_site: true
5960

6061
# Settings for installing a Drupal site (if 'install_site:' is 'true').
6162
drupal_major_version: 8
62-
drupal_core_path: "/var/www/drupalvm/drupal"
63+
drupal_core_path: "{{ drupal_composer_install_dir }}/web"
6364
drupal_domain: "{{ vagrant_hostname }}"
6465
drupal_site_name: "Drupal"
6566
drupal_install_profile: standard
@@ -241,7 +242,7 @@ composer_home_path: "/home/{{ drupalvm_user }}/.composer"
241242
composer_home_owner: "{{ drupalvm_user }}"
242243
composer_home_group: "{{ drupalvm_user }}"
243244
composer_global_packages:
244-
- { name: hirak/prestissimo, release: '^0.2' }
245+
- { name: hirak/prestissimo, release: '^0.3' }
245246

246247
# Run specified scripts before or after VM is provisioned. Path is relative to
247248
# the `provisioning/playbook.yml` file.

tests/ubuntu-16-nginx.config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
drupalvm_webserver: nginx
33

4-
# Test composer based installation.
5-
build_makefile: false
6-
build_composer: true
7-
drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
4+
# Test makefile based installation.
5+
build_makefile: true
6+
build_composer_project: false
7+
drupal_core_path: "/var/www/drupalvm/drupal"

0 commit comments

Comments
 (0)