Merge pull request #137 from thom8/beet_org

Migrate to beet org on Atlas.

README.md

@@ -4,7 +4,7 @@ Beetbox is a Vagrant configuration that provides your team with a versatile deve
 
 The project has a predefined set of default configuration attributes so it can work without any custom configuration, therefore any customisation comes in the form of overrides as undefined attributes will revert to their default setting.
 
-[![Circle CI](https://circleci.com/gh/drupalmel/beetbox.svg?style=svg)](https://circleci.com/gh/drupalmel/beetbox) [![Documentation Status](https://readthedocs.org/projects/beetbox/badge/?version=latest)](http://beetbox.readthedocs.org/en/latest/?badge=latest)
+[![Circle CI](https://circleci.com/gh/beetboxvm/beetbox.svg?style=svg)](https://circleci.com/gh/beetboxvm/beetbox) [![Documentation Status](https://readthedocs.org/projects/beetbox/badge/?version=stable)](http://beetbox.readthedocs.org/en/stable/?badge=stable)
 
 
 ## Features
@@ -28,13 +28,13 @@ The project has a predefined set of default configuration attributes so it can w
 To get a simple Drupal site up and running with Beetbox, run the following commands:
 
 ```
-drush dl drupal-8.0.2
-cd drupal-8.0.2
-vagrant init DrupalMel/beetbox
+drush dl drupal-8.0.3
+cd drupal-8.0.3
+vagrant init beet/box
 vagrant up
 ```
 
-After which you can install the site at [http://drupal-8-0-2.local/install.php](http://drupal-8-0-2.local/install.php)
+After which you can install the site at [http://drupal-8-0-3.local/install.php](http://drupal-8-0-3.local/install.php)
 
 
 ## Documentation
@@ -43,8 +43,8 @@ http://beetbox.rtfd.org
 
 ## Support
 
-* Feature requests should be created on [FeatHub](http://feathub.com/drupalmel/beetbox)
-* Bugs should be reported in the [GitHub Beetbox Issue Queue](https://github.com/drupalmel/beetbox/issues)
+* Feature requests should be created on [FeatHub](http://feathub.com/beetboxvm/beetbox)
+* Bugs should be reported in the [GitHub Beetbox Issue Queue](https://github.com/beetboxvm/beetbox/issues)
 * Use pull requests (PRs) to contribute to Beetbox.
 
 

Vagrantfile

@@ -12,7 +12,7 @@ local_config = "#{cwd}/#{config_dir}local.config.yml"
 
 # Default vagrant config.
 vconfig = {
-  'vagrant_box' => 'DrupalMel/beetbox',
+  'vagrant_box' => 'beet/box',
   'vagrant_box_version' => '>= 0.1.18',
   'vagrant_ip' => '0.0.0.0',
   'vagrant_memory' => 1024,
@@ -116,7 +116,7 @@ Vagrant.configure("2") do |config|
 
       # Provision box
       beet_sh = "#{vconfig['beet_home']}/provisioning/beetbox.sh"
-      remote_sh = "https://raw.githubusercontent.com/drupalmel/beetbox/master/provisioning/beetbox.sh"
+      remote_sh = "https://raw.githubusercontent.com/beetboxvm/beetbox/master/provisioning/beetbox.sh"
       local_provision = "sudo chmod +x #{beet_sh} && sudo -H #{beet_sh}"
       remote_provision = "sudo apt-get -qq update && curl -fsSL #{remote_sh} | sudo bash"
       node.vm.provision "ansible", type: "shell" do |s|

circle.yml

@@ -3,7 +3,7 @@ machine:
   hosts:
     beetbox.local: 127.0.0.1
   environment:
-    BEET_BOX: DrupalMel/beetbox
+    BEET_BOX: beet/box
     BEET_HOME: /beetbox
     BEET_BASE: /var/beetbox
     BEET_USER: ubuntu
@@ -23,14 +23,13 @@ test:
 deployment:
   dev:
     branch: master
-    owner: drupalmel
+    owner: beetboxvm
     commands:
       - chmod +x $BEET_HOME/$BEET_DEPLOY ; $BEET_HOME/$BEET_DEPLOY
   release:
     tag: /[0-9]+\.[0-9]+\.[0-9]+/
-    owner: drupalmel
+    owner: beetboxvm
     commands:
       - chmod +x $BEET_HOME/$BEET_DEPLOY
       - $BEET_HOME/$BEET_DEPLOY
-      - BEET_BOX=DrupalMel/beetbox-14.04 BEET_TEMPLATE=template-14.04.json $BEET_HOME/$BEET_DEPLOY
-      - BEET_BOX=DrupalMel/beetbox-12.04 BEET_TEMPLATE=template-12.04.json $BEET_HOME/$BEET_DEPLOY
+      - BEET_BOX=beet/box-14.04 BEET_TEMPLATE=template-14.04.json $BEET_HOME/$BEET_DEPLOY

docs/circle-ci.md

@@ -19,7 +19,7 @@ machine:
   environment:
     BEET_HOME: /beetbox
     BEET_USER: ubuntu
-    BEET_DEPENDENCIES: https://raw.githubusercontent.com/drupalmel/beetbox/master/provisioning/beetbox.sh
+    BEET_DEPENDENCIES: https://raw.githubusercontent.com/beetboxvm/beetbox/master/provisioning/beetbox.sh
 dependencies:
   pre:
     - curl -fsSL $BEET_DEPENDENCIES | bash

docs/configuration.md

@@ -11,9 +11,9 @@ so any of these YAML attributes could be imported into your project `config.yml`
 php_date_timezone: "Antarctica/South_Pole"
 ```
 
-The full list of ansible roles beetbox implements is here: [https://github.com/drupalmel/beetbox/blob/master/provisioning/ansible/beetbox.config.yml#L29](https://github.com/drupalmel/beetbox/blob/master/provisioning/ansible/beetbox.config.yml#L29)
+The full list of ansible roles beetbox implements is here: [https://github.com/beetboxvm/beetbox/blob/master/provisioning/ansible/beetbox.config.yml#L29](https://github.com/beetboxvm/beetbox/blob/master/provisioning/ansible/beetbox.config.yml#L29)
 
-Beetbox itself has a predefined set of configuration: https://github.com/drupalmel/beetbox/blob/master/provisioning/ansible/beetbox.config.yml
+Beetbox itself has a predefined set of configuration: https://github.com/beetboxvm/beetbox/blob/master/provisioning/ansible/beetbox.config.yml
 so not all attributes are defined inside roles and in some cases role attributes have already been overridden, however your project config will **always** override these settings.
 
 When overriding complex values, such as lists, it is necessarry to include all values; i.e. there is no merging of overidden and default values.
@@ -24,7 +24,7 @@ Beetbox
 -----------------
 Variable | Default  | Description
 --------------------- | ---------     | ----------
-`beet_repo`           | `https://github.com/DrupalMel/beetbox.git` | git project URL
+`beet_repo`           | `https://github.com/beetboxvm/beetbox.git` | git project URL
 `beet_version`        | `HEAD` | git project version
 `beet_home`           | `/beetbox` | path to beetbox repo inside VM
 `beet_role_dir`       | `/beetbox/ansible/roles` | path to ansible roles inside VM

docs/index.md

@@ -2,9 +2,9 @@
 
 Beetbox is a Vagrant configuration that provides your team with a versatile development environment for L*MP projects.
 
-The project has a predefined set of default configuration attributes so it can work without any custom configuration, therefore any customisation ocomes in the form of overrides as undefined attributes will revert to their default setting.
+The project has a predefined set of default configuration attributes so it can work without any custom configuration, therefore any customisation comes in the form of overrides as undefined attributes will revert to their default setting.
 
-[![Circle CI](https://circleci.com/gh/drupalmel/beetbox.svg?style=svg)](https://circleci.com/gh/drupalmel/beetbox) [![Documentation Status](https://readthedocs.org/projects/beetbox/badge/?version=latest)](http://beetbox.readthedocs.org/en/latest/?badge=latest)
+[![Circle CI](https://circleci.com/gh/beetboxvm/beetbox.svg?style=svg)](https://circleci.com/gh/beetboxvm/beetbox) [![Documentation Status](https://readthedocs.org/projects/beetbox/badge/?version=stable)](http://beetbox.readthedocs.org/en/stable/?badge=stable)
 
 
 ## Features
@@ -27,31 +27,31 @@ The project has a predefined set of default configuration attributes so it can w
 To get a simple Drupal site up and running with Beetbox, run the following commands:
 
 ```
-drush dl drupal-8.0.2
-cd drupal-8.0.2
-vagrant init DrupalMel/beetbox
+drush dl drupal-8.0.3
+cd drupal-8.0.3
+vagrant init beet/box
 vagrant up
 ```
 
-After which you can install the site at [http://drupal-8-0-2.local/install.php](http://drupal-8-0-2.local/install.php)
+After which you can install the site at [http://drupal-8-0-3.local/install.php](http://drupal-8-0-3.local/install.php)
 
 ## Integration
 
 Beetbox offers a few integration options.
-
-See. [integration](integration.md)
 
 ## Configuration
+
+See. [integration](integration.md)
 
 All customisation is done via a YAML configuration file at `.beetbox/config.yml`. If this file doesn't exist it is automatically created the first time you start up the VM.
 Configuration is applied hierarchically so any attribute set in your project config file will override a lower level default setting.
- 
+
 See. [configuration](configuration.md)
 
 ## Support
-
-* Feature requests should be created on [FeatHub](http://feathub.com/drupalmel/beetbox)
-* Bugs should be reported in the [GitHub Beetbox Issue Queue](https://github.com/drupalmel/beetbox/issues)
+ 
+* Feature requests should be created on [FeatHub](http://feathub.com/beetboxvm/beetbox)
+* Bugs should be reported in the [GitHub Beetbox Issue Queue](https://github.com/beetboxvm/beetbox/issues)
 * Use pull requests (PRs) to contribute to Beetbox.
 
 

docs/integration.md

@@ -5,14 +5,14 @@ Warning: Only use this method if you are 100% sure you won’t require customisa
 
 # Recommended
 
-Download the project [Vagrantfile](https://raw.githubusercontent.com/drupalmel/beetbox/master/Vagrantfile) to the root of your project.
+Download the project [Vagrantfile](https://raw.githubusercontent.com/beetboxvm/beetbox/master/Vagrantfile) to the root of your project.
 
 You can customise this as required for your project but please don’t remove any default functionality as this could break beetbox functionality. 
 
 There’s no need to keep this up to date with the latest version, you only need to merge upstream updates to resolve issues the latest version may have fixed. It is highly recommended that you use version control as it allows other developers involved in the project to check out the code, run vagrant up, and be on their way.
 
-You are free to implement plugins and improvements to vagrant as required for your project  using the [Vagrantfile docs](https://www.vagrantup.com/docs/vagrantfile/) for reference, please consider pushing improvements back to the project for the benefit of the beetbox community. - https://github.com/drupalmel/beetbox/pulls
+You are free to implement plugins and improvements to vagrant as required for your project  using the [Vagrantfile docs](https://www.vagrantup.com/docs/vagrantfile/) for reference, please consider pushing improvements back to the project for the benefit of the beetbox community. - https://github.com/beetboxvm/beetbox/pulls
 
 # Advanced
 
-You can maintain your own fork of our default [Vagrantfile](https://raw.githubusercontent.com/drupalmel/beetbox/master/Vagrantfile) which includes your own personal vagrant preferences which you can apply to new projects. Again please consider pushing improvements back to the project for the benefit of the beetbox community.
+You can maintain your own fork of our default [Vagrantfile](https://raw.githubusercontent.com/beetboxvm/beetbox/master/Vagrantfile) which includes your own personal vagrant preferences which you can apply to new projects. Again please consider pushing improvements back to the project for the benefit of the beetbox community.

provisioning/ansible/beetbox.config.yml

@@ -7,7 +7,7 @@
 #
 
 # Beetbox config.
-beet_repo: "{{ lookup('env','BEET_REPO') | default('https://github.com/DrupalMel/beetbox.git',true) }}"
+beet_repo: "{{ lookup('env','BEET_REPO') | default('https://github.com/beetboxvm/beetbox.git',true) }}"
 beet_version: "{{ lookup('env','BEET_VERSION') | default('master',true) }}"
 beet_home: "{{ lookup('env','BEET_HOME') | default('/beetbox',true) }}"
 beet_role_dir: "{{ beet_home }}/provisioning/ansible/roles"

provisioning/ansible/playbook-update.yml

@@ -23,7 +23,7 @@
 
     - set_fact:
         beet_update: yes
-      when: "{{ beet_repo != 'https://github.com/DrupalMel/beetbox.git' }}"
+      when: "{{ beet_repo != 'https://github.com/beetboxvm/beetbox.git' }}"
 
     - set_fact:
         beet_update: yes

provisioning/beetbox.sh

@@ -5,7 +5,7 @@ ANSIBLE_VERSION=${ANSIBLE_VERSION:-"2.0.0.2"}
 BEET_HOME=${BEET_HOME:-"/beetbox"}
 BEET_BASE=${BEET_BASE:-"/var/beetbox"}
 BEET_USER=${BEET_USER:-"vagrant"}
-BEET_REPO=${BEET_REPO:-"https://github.com/DrupalMel/beetbox.git"}
+BEET_REPO=${BEET_REPO:-"https://github.com/beetboxvm/beetbox.git"}
 BEET_VERSION=${BEET_VERSION:-"master"}
 BEET_TAG=${BEET_TAG:-""}
 BEET_DEBUG=${BEETBOX_DEBUG:-false}

provisioning/deploy.sh

@@ -1,9 +1,9 @@
 #!/bin/bash -e
 
 # Set default environment variables.
-ATLAS_BOX="$BEET_BOX-dev"
+ATLAS_BOX="beet/dev"
 ATLAS_VERSION=${BEET_VERSION:-"0.1.$CIRCLE_BUILD_NUM"}
-BUILD_VERSION=${CIRCLE_BRANCH:-"dev"}
+BUILD_VERSION=${CIRCLE_BRANCH:-"master"}
 BEET_TEMPLATE=${BEET_TEMPLATE:-"template.json"}
 PACKER_HOME=${PACKER_HOME:-"$BEET_HOME/provisioning"}
 PACKER_VAGRANTFILE=${PACKER_VAGRANTFILE:="$PACKER_HOME/packer/includes/Vagrantfile"}
@@ -22,7 +22,7 @@ sed -i "s/ATLAS_VERSION/$ATLAS_VERSION/" $BEET_TEMPLATE
 sed -i "s/BUILD_VERSION/$BUILD_VERSION/" $BEET_TEMPLATE
 
 # Update box Vagrantfile hash on dev builds.
-[ $ATLAS_BOX = "$BEET_BOX-dev" ] && sed -i "s/abef0f6a03cc23bb3da842cd1d12aa50/ef43117dab9c8e5d10a6b7d72d2e3fc4/" $PACKER_VAGRANTFILE
+[ $ATLAS_BOX = "beet/dev" ] && sed -i "s/ef550c44b71ef09513fe24c4b564c8a9/c704fbc0a4343dcd6778896a150604b5/" $PACKER_VAGRANTFILE
 
 # Trigger new build.
 packer push -token=$ATLAS_TOKEN -name="$ATLAS_BOX" $BEET_TEMPLATE

provisioning/packer/includes/Vagrantfile

@@ -35,7 +35,7 @@ end
 
 # Ensure project Vagrantfile hasn't been customized.
 # @TODO - Add secondary check that parses the Vagrantfile if the MD5 is changed.
-if cwd != nil && Digest::MD5.file("#{cwd}/#{vagrantfile}").hexdigest == "abef0f6a03cc23bb3da842cd1d12aa50"
+if cwd != nil && Digest::MD5.file("#{cwd}/#{vagrantfile}").hexdigest == "ef550c44b71ef09513fe24c4b564c8a9"
   config_dir = '.beetbox/'
   project_config = "#{cwd}/#{config_dir}config.yml"
   local_config = "#{cwd}/#{config_dir}local.config.yml"
@@ -87,7 +87,7 @@ if cwd != nil && Digest::MD5.file("#{cwd}/#{vagrantfile}").hexdigest == "abef0f6
       raise 'Your config requires auto_network plugin.' unless Vagrant.has_plugin?('vagrant-auto_network')
     end
 
-    config.vm.box = "DrupalMel/beetbox"
+    config.vm.box = "beet/box"
     config.vm.box_version = ">= 0.1.18"
     config.vm.hostname = hostname
     config.ssh.insert_key = false