diff --git a/.beetbox/.gitignore b/.beetbox/.gitignore deleted file mode 100644 index 113a0d9..0000000 --- a/.beetbox/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -host.config.yml -local.config.yml -Vagrantfile -Vagrantfile.local diff --git a/.beetbox/config.yml b/.beetbox/config.yml deleted file mode 100644 index a579082..0000000 --- a/.beetbox/config.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Vagrant config. -vagrant_ip: 192.168.88.88 - -# Beetbox settings. -beet_project: drupal -beet_domain: "d8.local" -beet_root: "{{ beet_base }}/docroot" -beet_site_name: "Drupal 8 Sprint Box" - -# Drupal settings. -drupal_create_makefile: yes -drupal_make_working_copy: true -drupal_build_makefile: yes -drupal_install_site: yes -drupal_account_name: admin -drupal_account_pass: admin -php_memory_limit: "284M" diff --git a/.gitignore b/.gitignore index ddbc6b7..75499ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +.beetbox/ .vagrant/ docroot/ +vendor/ +Vagrantfile \ No newline at end of file diff --git a/README.md b/README.md index 54605c3..3f966b5 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ Simple Vagrant config to download and install the latest dev version of Drupal 8 ## Requirements +* [Composer](https://getcomposer.org/download/) * [Vagrant](https://www.vagrantup.com/) >= 1.8 * [Virtualbox](https://www.virtualbox.org/) * [Vagrant Hostsupdater](https://github.com/cogitatio/vagrant-hostsupdater) @@ -14,10 +15,11 @@ Simple Vagrant config to download and install the latest dev version of Drupal 8 ``` git clone https://github.com/thom8/drupal8-vagrant.git drupal8-vagrant && cd $_ + composer install vagrant up ``` - 2. Go to http://d8.ddns.net/ + 2. Go to http://d8.local/ ``` username: admin diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 08599cd..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,25 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -ENV['BEET_ROOT_DIR'] = "#{__dir__}" -ENV['BEET_CONFIG_DIR'] = ENV['BEET_CONFIG_DIR'] || "#{ENV['BEET_ROOT_DIR']}/.beetbox" -r_vagrantfile = ENV['BEET_VAGRANTFILE'] || "https://raw.githubusercontent.com/beetboxvm/beetbox/master/.beetbox/Vagrantfile" -l_vagrantfile = "#{ENV['BEET_CONFIG_DIR']}/Vagrantfile" - -# Create local Vagrantfile. -if !File.exist?(l_vagrantfile) - require 'fileutils' - require 'open-uri' - begin - FileUtils::mkdir_p ENV['BEET_CONFIG_DIR'] - vfile = open(r_vagrantfile).read - rescue - raise "Can't access #{r_vagrantfile}." - else - f = open(l_vagrantfile, 'w+') << vfile - f.close - end -end - -# load local Vagrantfile. -load l_vagrantfile diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..a054fbc --- /dev/null +++ b/composer.json @@ -0,0 +1,40 @@ +{ + "name": "thom8/drupal8-vagrant", + "description": "", + "type": "project", + "license": "MIT", + "minimum-stability": "dev", + "require-dev": { + "beet/box": "dev-master" + }, + "scripts": { + "up": "vagrant up", + "provision": "vagrant provision", + "reset": [ + "vagrant ssh -c 'drush --root=/var/beetbox/docroot sql-drop -y'", + "@provision" + ], + "reset-full": [ + "vagrant ssh -c '[ ! -d /var/beetbox/docroot ] && sudo chmod -R 755 /var/beetbox/docroot && rm -rf /var/beetbox/docroot'", + "@provision" + ] + }, + "process-timout": 0, + "extra": { + "beetbox": { + "config": { + "vagrant_ip": "192.168.88.88", + "beet_domain": "d8.local", + "beet_root": "{{ beet_base }}/docroot", + "beet_site_name": "Drupal 8 Sprint Box", + "drupal_create_makefile": true, + "drupal_make_working_copy": true, + "drupal_build_makefile": true, + "drupal_install_site": true, + "drupal_account_name": "admin", + "drupal_account_pass": "admin", + "php_memory_limit": "284M" + } + } + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..ba998df --- /dev/null +++ b/composer.lock @@ -0,0 +1,61 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "06dc05fcd9f114ce123e1eb18f403984", + "packages": [], + "packages-dev": [ + { + "name": "beet/box", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/beetboxvm/beetbox.git", + "reference": "95788756e1de4792e5a77bffcb4d278a43c3f9a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/beetboxvm/beetbox/zipball/95788756e1de4792e5a77bffcb4d278a43c3f9a1", + "reference": "95788756e1de4792e5a77bffcb4d278a43c3f9a1", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" + }, + "require-dev": { + "composer/composer": "dev-master", + "phpunit/phpunit": "^4.4.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Beet\\Box\\Plugin", + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Beet\\Box\\": "composer/src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pre-provisioned L*MP stack VM", + "homepage": "https://github.com/beetboxvm/beetbox", + "time": "2017-01-21 03:00:20" + } + ], + "aliases": [], + "minimum-stability": "dev", + "stability-flags": { + "beet/box": 20 + }, + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +} diff --git a/reset-full.sh b/reset-full.sh deleted file mode 100755 index 57f952e..0000000 --- a/reset-full.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -vagrant ssh -c "sudo chmod 775 /var/beetbox/docroot/sites/default && rm -rf /var/beetbox/docroot" -vagrant provision diff --git a/reset.sh b/reset.sh deleted file mode 100755 index 29fca60..0000000 --- a/reset.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -vagrant ssh -c "cd /var/beetbox/docroot && drush sql-drop -y" -vagrant provision