Fix symlinks by mounting the entire directory including aquifer

ccjjmartin · Feb 23, 2016 · 9c49bd4 · 9c49bd4
1 parent 083b133
commit 9c49bd4
Show file tree

Hide file tree

Showing 63 changed files with 3 additions and 381 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1 @@
-www/drupal/
+drupal/
diff --git a/aquifer/aquifer.json b/aquifer/aquifer.json
@@ -4,7 +4,7 @@
     "make": "drupal.make.yml",
     "lock": false,
     "settings": "settings",
-    "build": "../www/drupal",
+    "build": "../drupal",
     "root": "root",
     "drush": "drush",
     "themes": {

diff --git a/drupalvm/.gitignore → vm/.gitignore b/drupalvm/.gitignore → vm/.gitignore
diff --git a/drupalvm/.travis.yml → vm/.travis.yml b/drupalvm/.travis.yml → vm/.travis.yml
diff --git a/drupalvm/LICENSE → vm/LICENSE b/drupalvm/LICENSE → vm/LICENSE
diff --git a/drupalvm/README.md → vm/README.md b/drupalvm/README.md → vm/README.md
diff --git a/drupalvm/Vagrantfile → vm/Vagrantfile b/drupalvm/Vagrantfile → vm/Vagrantfile
diff --git a/drupalvm/config.yml → vm/config.yml b/drupalvm/config.yml → vm/config.yml
@@ -22,7 +22,7 @@ vagrant_public_ip: ""
 vagrant_synced_folders:
   # The first synced folder will be used for the default Drupal installation, if
   # build_makefile: is 'true'.
-  - local_path: ../www
+  - local_path: ../
     destination: /var/www
     type: nfs
     create: true

diff --git a/drupalvm/docs/deployment/drush-make.md → vm/docs/deployment/drush-make.md b/drupalvm/docs/deployment/drush-make.md → vm/docs/deployment/drush-make.md
diff --git a/drupalvm/docs/deployment/local-codebase.md → vm/docs/deployment/local-codebase.md b/drupalvm/docs/deployment/local-codebase.md → vm/docs/deployment/local-codebase.md
diff --git a/drupalvm/docs/deployment/multisite.md → vm/docs/deployment/multisite.md b/drupalvm/docs/deployment/multisite.md → vm/docs/deployment/multisite.md
diff --git a/drupalvm/docs/extras/behat.md → vm/docs/extras/behat.md b/drupalvm/docs/extras/behat.md → vm/docs/extras/behat.md
diff --git a/drupalvm/docs/extras/drupal-console.md → vm/docs/extras/drupal-console.md b/drupalvm/docs/extras/drupal-console.md → vm/docs/extras/drupal-console.md
diff --git a/drupalvm/docs/extras/drush.md → vm/docs/extras/drush.md b/drupalvm/docs/extras/drush.md → vm/docs/extras/drush.md
diff --git a/drupalvm/docs/extras/mailhog.md → vm/docs/extras/mailhog.md b/drupalvm/docs/extras/mailhog.md → vm/docs/extras/mailhog.md
diff --git a/drupalvm/docs/extras/mariadb.md → vm/docs/extras/mariadb.md b/drupalvm/docs/extras/mariadb.md → vm/docs/extras/mariadb.md
diff --git a/drupalvm/docs/extras/mysql.md → vm/docs/extras/mysql.md b/drupalvm/docs/extras/mysql.md → vm/docs/extras/mysql.md
diff --git a/drupalvm/docs/extras/nodejs.md → vm/docs/extras/nodejs.md b/drupalvm/docs/extras/nodejs.md → vm/docs/extras/nodejs.md
diff --git a/drupalvm/docs/extras/pimpmylog.md → vm/docs/extras/pimpmylog.md b/drupalvm/docs/extras/pimpmylog.md → vm/docs/extras/pimpmylog.md
diff --git a/drupalvm/docs/extras/scripts.md → vm/docs/extras/scripts.md b/drupalvm/docs/extras/scripts.md → vm/docs/extras/scripts.md
diff --git a/drupalvm/docs/extras/solr.md → vm/docs/extras/solr.md b/drupalvm/docs/extras/solr.md → vm/docs/extras/solr.md
diff --git a/drupalvm/docs/extras/syncing-folders.md → vm/docs/extras/syncing-folders.md b/drupalvm/docs/extras/syncing-folders.md → vm/docs/extras/syncing-folders.md
diff --git a/drupalvm/docs/extras/varnish.md → vm/docs/extras/varnish.md b/drupalvm/docs/extras/varnish.md → vm/docs/extras/varnish.md
diff --git a/drupalvm/docs/extras/xdebug.md → vm/docs/extras/xdebug.md b/drupalvm/docs/extras/xdebug.md → vm/docs/extras/xdebug.md
diff --git a/drupalvm/docs/extras/xhprof.md → vm/docs/extras/xhprof.md b/drupalvm/docs/extras/xhprof.md → vm/docs/extras/xhprof.md
diff --git a/drupalvm/docs/images/drupal-vm-logo.png → vm/docs/images/drupal-vm-logo.png b/drupalvm/docs/images/drupal-vm-logo.png → vm/docs/images/drupal-vm-logo.png
diff --git a/drupalvm/docs/index.md → vm/docs/index.md b/drupalvm/docs/index.md → vm/docs/index.md
diff --git a/drupalvm/docs/other/base-os.md → vm/docs/other/base-os.md b/drupalvm/docs/other/base-os.md → vm/docs/other/base-os.md
diff --git a/drupalvm/docs/other/cloning-with-newd.md → vm/docs/other/cloning-with-newd.md b/drupalvm/docs/other/cloning-with-newd.md → vm/docs/other/cloning-with-newd.md
diff --git a/drupalvm/docs/other/drupal-6.md → vm/docs/other/drupal-6.md b/drupalvm/docs/other/drupal-6.md → vm/docs/other/drupal-6.md
diff --git a/drupalvm/docs/other/linux.md → vm/docs/other/linux.md b/drupalvm/docs/other/linux.md → vm/docs/other/linux.md
diff --git a/drupalvm/docs/other/networking.md → vm/docs/other/networking.md b/drupalvm/docs/other/networking.md → vm/docs/other/networking.md
diff --git a/drupalvm/docs/other/php-7.md → vm/docs/other/php-7.md b/drupalvm/docs/other/php-7.md → vm/docs/other/php-7.md
diff --git a/drupalvm/docs/other/vagrant-virtualbox.md → vm/docs/other/vagrant-virtualbox.md b/drupalvm/docs/other/vagrant-virtualbox.md → vm/docs/other/vagrant-virtualbox.md
diff --git a/drupalvm/docs/other/webservers.md → vm/docs/other/webservers.md b/drupalvm/docs/other/webservers.md → vm/docs/other/webservers.md
diff --git a/drupalvm/docs/other/windows.md → vm/docs/other/windows.md b/drupalvm/docs/other/windows.md → vm/docs/other/windows.md
diff --git a/drupalvm/example.config.yml → vm/example.config.yml b/drupalvm/example.config.yml → vm/example.config.yml
diff --git a/drupalvm/example.drupal.make.yml → vm/example.drupal.make.yml b/drupalvm/example.drupal.make.yml → vm/example.drupal.make.yml
diff --git a/drupalvm/examples/acquia/README.md → vm/examples/acquia/README.md b/drupalvm/examples/acquia/README.md → vm/examples/acquia/README.md
diff --git a/...alvm/examples/acquia/acquia.overrides.yml → vm/examples/acquia/acquia.overrides.yml b/...alvm/examples/acquia/acquia.overrides.yml → vm/examples/acquia/acquia.overrides.yml
diff --git a/drupalvm/examples/prod/README.md → vm/examples/prod/README.md b/drupalvm/examples/prod/README.md → vm/examples/prod/README.md
diff --git a/drupalvm/examples/prod/example.inventory → vm/examples/prod/example.inventory b/drupalvm/examples/prod/example.inventory → vm/examples/prod/example.inventory
diff --git a/drupalvm/examples/prod/prod.overrides.yml → vm/examples/prod/prod.overrides.yml b/drupalvm/examples/prod/prod.overrides.yml → vm/examples/prod/prod.overrides.yml
diff --git a/drupalvm/examples/scripts/README.md → vm/examples/scripts/README.md b/drupalvm/examples/scripts/README.md → vm/examples/scripts/README.md
diff --git a/drupalvm/examples/scripts/configure-solr.sh → vm/examples/scripts/configure-solr.sh b/drupalvm/examples/scripts/configure-solr.sh → vm/examples/scripts/configure-solr.sh
diff --git a/drupalvm/mkdocs.yml → vm/mkdocs.yml b/drupalvm/mkdocs.yml → vm/mkdocs.yml
diff --git a/drupalvm/provisioning/playbook.yml → vm/provisioning/playbook.yml b/drupalvm/provisioning/playbook.yml → vm/provisioning/playbook.yml
diff --git a/drupalvm/provisioning/requirements.yml → vm/provisioning/requirements.yml b/drupalvm/provisioning/requirements.yml → vm/provisioning/requirements.yml
diff --git a/drupalvm/provisioning/tasks/apparmor.yml → vm/provisioning/tasks/apparmor.yml b/drupalvm/provisioning/tasks/apparmor.yml → vm/provisioning/tasks/apparmor.yml
diff --git a/...lvm/provisioning/tasks/build-makefile.yml → vm/provisioning/tasks/build-makefile.yml b/...lvm/provisioning/tasks/build-makefile.yml → vm/provisioning/tasks/build-makefile.yml
diff --git a/drupalvm/provisioning/tasks/cron.yml → vm/provisioning/tasks/cron.yml b/drupalvm/provisioning/tasks/cron.yml → vm/provisioning/tasks/cron.yml
diff --git a/...alvm/provisioning/tasks/drush-aliases.yml → vm/provisioning/tasks/drush-aliases.yml b/...alvm/provisioning/tasks/drush-aliases.yml → vm/provisioning/tasks/drush-aliases.yml
diff --git a/drupalvm/provisioning/tasks/extras.yml → vm/provisioning/tasks/extras.yml b/drupalvm/provisioning/tasks/extras.yml → vm/provisioning/tasks/extras.yml
diff --git a/drupalvm/provisioning/tasks/init-debian.yml → vm/provisioning/tasks/init-debian.yml b/drupalvm/provisioning/tasks/init-debian.yml → vm/provisioning/tasks/init-debian.yml
diff --git a/drupalvm/provisioning/tasks/init-redhat.yml → vm/provisioning/tasks/init-redhat.yml b/drupalvm/provisioning/tasks/init-redhat.yml → vm/provisioning/tasks/init-redhat.yml
diff --git a/drupalvm/provisioning/tasks/install-site.yml → vm/provisioning/tasks/install-site.yml b/drupalvm/provisioning/tasks/install-site.yml → vm/provisioning/tasks/install-site.yml
diff --git a/drupalvm/provisioning/tasks/sshd.yml → vm/provisioning/tasks/sshd.yml b/drupalvm/provisioning/tasks/sshd.yml → vm/provisioning/tasks/sshd.yml
diff --git a/drupalvm/provisioning/tasks/www.yml → vm/provisioning/tasks/www.yml b/drupalvm/provisioning/tasks/www.yml → vm/provisioning/tasks/www.yml
diff --git a/...tes/drupalvm-local.aliases.drushrc.php.j2 → ...tes/drupalvm-local.aliases.drushrc.php.j2 b/...tes/drupalvm-local.aliases.drushrc.php.j2 → ...tes/drupalvm-local.aliases.drushrc.php.j2
diff --git a/...templates/drupalvm.aliases.drushrc.php.j2 → ...templates/drupalvm.aliases.drushrc.php.j2 b/...templates/drupalvm.aliases.drushrc.php.j2 → ...templates/drupalvm.aliases.drushrc.php.j2
diff --git a/...vm/provisioning/templates/drupalvm.vcl.j2 → vm/provisioning/templates/drupalvm.vcl.j2 b/...vm/provisioning/templates/drupalvm.vcl.j2 → vm/provisioning/templates/drupalvm.vcl.j2
diff --git a/...rovisioning/templates/nginx-vhost.conf.j2 → ...rovisioning/templates/nginx-vhost.conf.j2 b/...rovisioning/templates/nginx-vhost.conf.j2 → ...rovisioning/templates/nginx-vhost.conf.j2
diff --git a/www/html/index.html b/www/html/index.html