Skip to content

Commit

Permalink
initial tool provisioner split
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjn committed Aug 28, 2021
1 parent feb44c0 commit 4746ceb
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Vagrantfile
Expand Up @@ -726,6 +726,8 @@ Vagrant.configure('2') do |config|
config.vm.provision 'default', type: 'shell', keep_color: true, path: File.join('provision', 'provision.sh'), env: { "VVV_LOG" => "main" }
end

config.vm.provision 'tools', type: 'shell', keep_color: true, path: File.join('provision', 'provision-tools.sh'), env: { "VVV_LOG" => "tools" }

# Provision the dashboard that appears when you visit vvv.test
config.vm.provision 'dashboard',
type: 'shell',
Expand Down
2 changes: 1 addition & 1 deletion provision/core/composer/provision.sh
Expand Up @@ -60,4 +60,4 @@ function composer_setup() {
}
export -f composer_setup

vvv_add_hook after_packages composer_setup
vvv_add_hook tools_setup composer_setup
2 changes: 1 addition & 1 deletion provision/core/grunt/provision.sh
Expand Up @@ -50,4 +50,4 @@ function grunt_setup() {
}
export -f grunt_setup

vvv_add_hook after_packages grunt_setup
vvv_add_hook tools_setup grunt_setup
2 changes: 1 addition & 1 deletion provision/core/nodejs/provision.sh
Expand Up @@ -55,4 +55,4 @@ function node_setup() {
}
export -f node_setup

vvv_add_hook after_packages node_setup
vvv_add_hook tools_setup node_setup
54 changes: 54 additions & 0 deletions provision/provision-tools.sh
@@ -0,0 +1,54 @@
#!/usr/bin/env bash
# @description This file is specified in Vagrantfile and is loaded by Vagrant
# as the primary provisioning script whenever the commands `vagrant up`,
# `vagrant provision`, or `vagrant reload` are used. It provides all of the
# default packages and configurations included with VVV.

# source bash_aliases before anything else so that PATH is properly configured on
# this shell session
. "/srv/provision/core/env/homedir/.bash_aliases"


export VVV_CONFIG=/vagrant/config.yml

# initialize provisioner helpers a bit later
. "/srv/provision/provisioners.sh"

export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1

. "/srv/provision/core/env/provision.sh"
. '/srv/provision/core/deprecated.sh'
. "/srv/provision/core/vvv/provision.sh"
. "/srv/provision/core/git/provision.sh"
. "/srv/provision/core/mariadb/provision.sh"
. "/srv/provision/core/postfix/provision.sh"
. "/srv/provision/core/nginx/provision.sh"
. "/srv/provision/core/memcached/provision.sh"
. "/srv/provision/core/php/provision.sh"
. "/srv/provision/core/composer/provision.sh"
. "/srv/provision/core/nodejs/provision.sh"
. "/srv/provision/core/grunt/provision.sh"
. "/srv/provision/core/mailhog/provision.sh"
. "/srv/provision/core/wp-cli/provision.sh"
. "/srv/provision/core/phpcs/provision.sh"

### SCRIPT
#set -xv

vvv_hook init

if ! network_check; then
exit 1
fi

# Package and Tools Install
vvv_info " * Running tools_install"
vvv_hook tools_setup

vvv_info " * Finalizing Tools"
vvv_hook tools_finalize

#set +xv
# And it's done

provisioner_success
2 changes: 1 addition & 1 deletion provision/provision.sh
Expand Up @@ -90,7 +90,7 @@ if ! vvv_package_install ${VVV_PACKAGE_LIST[@]}; then
exit 1
fi

vvv_info " * Running tools_install"
vvv_info " * Running after_packages"
vvv_hook after_packages

vvv_info " * Finalizing"
Expand Down

0 comments on commit 4746ceb

Please sign in to comment.