diff --git a/.gitignore b/.gitignore index efff754..6ae1a21 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -www/drupal/ +drupal/ diff --git a/aquifer/aquifer.json b/aquifer/aquifer.json index 8c81b2e..6380328 100644 --- 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 b/vm/.gitignore similarity index 100% rename from drupalvm/.gitignore rename to vm/.gitignore diff --git a/drupalvm/.travis.yml b/vm/.travis.yml similarity index 100% rename from drupalvm/.travis.yml rename to vm/.travis.yml diff --git a/drupalvm/LICENSE b/vm/LICENSE similarity index 100% rename from drupalvm/LICENSE rename to vm/LICENSE diff --git a/drupalvm/README.md b/vm/README.md similarity index 100% rename from drupalvm/README.md rename to vm/README.md diff --git a/drupalvm/Vagrantfile b/vm/Vagrantfile similarity index 100% rename from drupalvm/Vagrantfile rename to vm/Vagrantfile diff --git a/drupalvm/config.yml b/vm/config.yml similarity index 99% rename from drupalvm/config.yml rename to vm/config.yml index 8a1c63b..8788005 100644 --- a/drupalvm/config.yml +++ b/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 b/vm/docs/deployment/drush-make.md similarity index 100% rename from drupalvm/docs/deployment/drush-make.md rename to vm/docs/deployment/drush-make.md diff --git a/drupalvm/docs/deployment/local-codebase.md b/vm/docs/deployment/local-codebase.md similarity index 100% rename from drupalvm/docs/deployment/local-codebase.md rename to vm/docs/deployment/local-codebase.md diff --git a/drupalvm/docs/deployment/multisite.md b/vm/docs/deployment/multisite.md similarity index 100% rename from drupalvm/docs/deployment/multisite.md rename to vm/docs/deployment/multisite.md diff --git a/drupalvm/docs/extras/behat.md b/vm/docs/extras/behat.md similarity index 100% rename from drupalvm/docs/extras/behat.md rename to vm/docs/extras/behat.md diff --git a/drupalvm/docs/extras/drupal-console.md b/vm/docs/extras/drupal-console.md similarity index 100% rename from drupalvm/docs/extras/drupal-console.md rename to vm/docs/extras/drupal-console.md diff --git a/drupalvm/docs/extras/drush.md b/vm/docs/extras/drush.md similarity index 100% rename from drupalvm/docs/extras/drush.md rename to vm/docs/extras/drush.md diff --git a/drupalvm/docs/extras/mailhog.md b/vm/docs/extras/mailhog.md similarity index 100% rename from drupalvm/docs/extras/mailhog.md rename to vm/docs/extras/mailhog.md diff --git a/drupalvm/docs/extras/mariadb.md b/vm/docs/extras/mariadb.md similarity index 100% rename from drupalvm/docs/extras/mariadb.md rename to vm/docs/extras/mariadb.md diff --git a/drupalvm/docs/extras/mysql.md b/vm/docs/extras/mysql.md similarity index 100% rename from drupalvm/docs/extras/mysql.md rename to vm/docs/extras/mysql.md diff --git a/drupalvm/docs/extras/nodejs.md b/vm/docs/extras/nodejs.md similarity index 100% rename from drupalvm/docs/extras/nodejs.md rename to vm/docs/extras/nodejs.md diff --git a/drupalvm/docs/extras/pimpmylog.md b/vm/docs/extras/pimpmylog.md similarity index 100% rename from drupalvm/docs/extras/pimpmylog.md rename to vm/docs/extras/pimpmylog.md diff --git a/drupalvm/docs/extras/scripts.md b/vm/docs/extras/scripts.md similarity index 100% rename from drupalvm/docs/extras/scripts.md rename to vm/docs/extras/scripts.md diff --git a/drupalvm/docs/extras/solr.md b/vm/docs/extras/solr.md similarity index 100% rename from drupalvm/docs/extras/solr.md rename to vm/docs/extras/solr.md diff --git a/drupalvm/docs/extras/syncing-folders.md b/vm/docs/extras/syncing-folders.md similarity index 100% rename from drupalvm/docs/extras/syncing-folders.md rename to vm/docs/extras/syncing-folders.md diff --git a/drupalvm/docs/extras/varnish.md b/vm/docs/extras/varnish.md similarity index 100% rename from drupalvm/docs/extras/varnish.md rename to vm/docs/extras/varnish.md diff --git a/drupalvm/docs/extras/xdebug.md b/vm/docs/extras/xdebug.md similarity index 100% rename from drupalvm/docs/extras/xdebug.md rename to vm/docs/extras/xdebug.md diff --git a/drupalvm/docs/extras/xhprof.md b/vm/docs/extras/xhprof.md similarity index 100% rename from drupalvm/docs/extras/xhprof.md rename to vm/docs/extras/xhprof.md diff --git a/drupalvm/docs/images/drupal-vm-logo.png b/vm/docs/images/drupal-vm-logo.png similarity index 100% rename from drupalvm/docs/images/drupal-vm-logo.png rename to vm/docs/images/drupal-vm-logo.png diff --git a/drupalvm/docs/index.md b/vm/docs/index.md similarity index 100% rename from drupalvm/docs/index.md rename to vm/docs/index.md diff --git a/drupalvm/docs/other/base-os.md b/vm/docs/other/base-os.md similarity index 100% rename from drupalvm/docs/other/base-os.md rename to vm/docs/other/base-os.md diff --git a/drupalvm/docs/other/cloning-with-newd.md b/vm/docs/other/cloning-with-newd.md similarity index 100% rename from drupalvm/docs/other/cloning-with-newd.md rename to vm/docs/other/cloning-with-newd.md diff --git a/drupalvm/docs/other/drupal-6.md b/vm/docs/other/drupal-6.md similarity index 100% rename from drupalvm/docs/other/drupal-6.md rename to vm/docs/other/drupal-6.md diff --git a/drupalvm/docs/other/linux.md b/vm/docs/other/linux.md similarity index 100% rename from drupalvm/docs/other/linux.md rename to vm/docs/other/linux.md diff --git a/drupalvm/docs/other/networking.md b/vm/docs/other/networking.md similarity index 100% rename from drupalvm/docs/other/networking.md rename to vm/docs/other/networking.md diff --git a/drupalvm/docs/other/php-7.md b/vm/docs/other/php-7.md similarity index 100% rename from drupalvm/docs/other/php-7.md rename to vm/docs/other/php-7.md diff --git a/drupalvm/docs/other/vagrant-virtualbox.md b/vm/docs/other/vagrant-virtualbox.md similarity index 100% rename from drupalvm/docs/other/vagrant-virtualbox.md rename to vm/docs/other/vagrant-virtualbox.md diff --git a/drupalvm/docs/other/webservers.md b/vm/docs/other/webservers.md similarity index 100% rename from drupalvm/docs/other/webservers.md rename to vm/docs/other/webservers.md diff --git a/drupalvm/docs/other/windows.md b/vm/docs/other/windows.md similarity index 100% rename from drupalvm/docs/other/windows.md rename to vm/docs/other/windows.md diff --git a/drupalvm/example.config.yml b/vm/example.config.yml similarity index 100% rename from drupalvm/example.config.yml rename to vm/example.config.yml diff --git a/drupalvm/example.drupal.make.yml b/vm/example.drupal.make.yml similarity index 100% rename from drupalvm/example.drupal.make.yml rename to vm/example.drupal.make.yml diff --git a/drupalvm/examples/acquia/README.md b/vm/examples/acquia/README.md similarity index 100% rename from drupalvm/examples/acquia/README.md rename to vm/examples/acquia/README.md diff --git a/drupalvm/examples/acquia/acquia.overrides.yml b/vm/examples/acquia/acquia.overrides.yml similarity index 100% rename from drupalvm/examples/acquia/acquia.overrides.yml rename to vm/examples/acquia/acquia.overrides.yml diff --git a/drupalvm/examples/prod/README.md b/vm/examples/prod/README.md similarity index 100% rename from drupalvm/examples/prod/README.md rename to vm/examples/prod/README.md diff --git a/drupalvm/examples/prod/example.inventory b/vm/examples/prod/example.inventory similarity index 100% rename from drupalvm/examples/prod/example.inventory rename to vm/examples/prod/example.inventory diff --git a/drupalvm/examples/prod/prod.overrides.yml b/vm/examples/prod/prod.overrides.yml similarity index 100% rename from drupalvm/examples/prod/prod.overrides.yml rename to vm/examples/prod/prod.overrides.yml diff --git a/drupalvm/examples/scripts/README.md b/vm/examples/scripts/README.md similarity index 100% rename from drupalvm/examples/scripts/README.md rename to vm/examples/scripts/README.md diff --git a/drupalvm/examples/scripts/configure-solr.sh b/vm/examples/scripts/configure-solr.sh similarity index 100% rename from drupalvm/examples/scripts/configure-solr.sh rename to vm/examples/scripts/configure-solr.sh diff --git a/drupalvm/mkdocs.yml b/vm/mkdocs.yml similarity index 100% rename from drupalvm/mkdocs.yml rename to vm/mkdocs.yml diff --git a/drupalvm/provisioning/playbook.yml b/vm/provisioning/playbook.yml similarity index 100% rename from drupalvm/provisioning/playbook.yml rename to vm/provisioning/playbook.yml diff --git a/drupalvm/provisioning/requirements.yml b/vm/provisioning/requirements.yml similarity index 100% rename from drupalvm/provisioning/requirements.yml rename to vm/provisioning/requirements.yml diff --git a/drupalvm/provisioning/tasks/apparmor.yml b/vm/provisioning/tasks/apparmor.yml similarity index 100% rename from drupalvm/provisioning/tasks/apparmor.yml rename to vm/provisioning/tasks/apparmor.yml diff --git a/drupalvm/provisioning/tasks/build-makefile.yml b/vm/provisioning/tasks/build-makefile.yml similarity index 100% rename from drupalvm/provisioning/tasks/build-makefile.yml rename to vm/provisioning/tasks/build-makefile.yml diff --git a/drupalvm/provisioning/tasks/cron.yml b/vm/provisioning/tasks/cron.yml similarity index 100% rename from drupalvm/provisioning/tasks/cron.yml rename to vm/provisioning/tasks/cron.yml diff --git a/drupalvm/provisioning/tasks/drush-aliases.yml b/vm/provisioning/tasks/drush-aliases.yml similarity index 100% rename from drupalvm/provisioning/tasks/drush-aliases.yml rename to vm/provisioning/tasks/drush-aliases.yml diff --git a/drupalvm/provisioning/tasks/extras.yml b/vm/provisioning/tasks/extras.yml similarity index 100% rename from drupalvm/provisioning/tasks/extras.yml rename to vm/provisioning/tasks/extras.yml diff --git a/drupalvm/provisioning/tasks/init-debian.yml b/vm/provisioning/tasks/init-debian.yml similarity index 100% rename from drupalvm/provisioning/tasks/init-debian.yml rename to vm/provisioning/tasks/init-debian.yml diff --git a/drupalvm/provisioning/tasks/init-redhat.yml b/vm/provisioning/tasks/init-redhat.yml similarity index 100% rename from drupalvm/provisioning/tasks/init-redhat.yml rename to vm/provisioning/tasks/init-redhat.yml diff --git a/drupalvm/provisioning/tasks/install-site.yml b/vm/provisioning/tasks/install-site.yml similarity index 100% rename from drupalvm/provisioning/tasks/install-site.yml rename to vm/provisioning/tasks/install-site.yml diff --git a/drupalvm/provisioning/tasks/sshd.yml b/vm/provisioning/tasks/sshd.yml similarity index 100% rename from drupalvm/provisioning/tasks/sshd.yml rename to vm/provisioning/tasks/sshd.yml diff --git a/drupalvm/provisioning/tasks/www.yml b/vm/provisioning/tasks/www.yml similarity index 100% rename from drupalvm/provisioning/tasks/www.yml rename to vm/provisioning/tasks/www.yml diff --git a/drupalvm/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 b/vm/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 similarity index 100% rename from drupalvm/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 rename to vm/provisioning/templates/drupalvm-local.aliases.drushrc.php.j2 diff --git a/drupalvm/provisioning/templates/drupalvm.aliases.drushrc.php.j2 b/vm/provisioning/templates/drupalvm.aliases.drushrc.php.j2 similarity index 100% rename from drupalvm/provisioning/templates/drupalvm.aliases.drushrc.php.j2 rename to vm/provisioning/templates/drupalvm.aliases.drushrc.php.j2 diff --git a/drupalvm/provisioning/templates/drupalvm.vcl.j2 b/vm/provisioning/templates/drupalvm.vcl.j2 similarity index 100% rename from drupalvm/provisioning/templates/drupalvm.vcl.j2 rename to vm/provisioning/templates/drupalvm.vcl.j2 diff --git a/drupalvm/provisioning/templates/nginx-vhost.conf.j2 b/vm/provisioning/templates/nginx-vhost.conf.j2 similarity index 100% rename from drupalvm/provisioning/templates/nginx-vhost.conf.j2 rename to vm/provisioning/templates/nginx-vhost.conf.j2 diff --git a/www/html/index.html b/www/html/index.html deleted file mode 100644 index f0c91c7..0000000 --- a/www/html/index.html +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - - Apache2 Ubuntu Default Page: It works - - - -
- - -
- - -
-
- It works! -
-
-

- This is the default welcome page used to test the correct - operation of the Apache2 server after installation on Ubuntu systems. - It is based on the equivalent page on Debian, from which the Ubuntu Apache - packaging is derived. - If you can read this page, it means that the Apache HTTP server installed at - this site is working properly. You should replace this file (located at - /var/www/html/index.html) before continuing to operate your HTTP server. -

- - -

- If you are a normal user of this web site and don't know what this page is - about, this probably means that the site is currently unavailable due to - maintenance. - If the problem persists, please contact the site's administrator. -

- -
-
-
- Configuration Overview -
-
-

- Ubuntu's Apache2 default configuration is different from the - upstream default configuration, and split into several files optimized for - interaction with Ubuntu tools. The configuration system is - fully documented in - /usr/share/doc/apache2/README.Debian.gz. Refer to this for the full - documentation. Documentation for the web server itself can be - found by accessing the manual if the apache2-doc - package was installed on this server. - -

-

- The configuration layout for an Apache2 web server installation on Ubuntu systems is as follows: -

-
-/etc/apache2/
-|-- apache2.conf
-|       `--  ports.conf
-|-- mods-enabled
-|       |-- *.load
-|       `-- *.conf
-|-- conf-enabled
-|       `-- *.conf
-|-- sites-enabled
-|       `-- *.conf
-          
-
    -
  • - apache2.conf is the main configuration - file. It puts the pieces together by including all remaining configuration - files when starting up the web server. -
  • - -
  • - ports.conf is always included from the - main configuration file. It is used to determine the listening ports for - incoming connections, and this file can be customized anytime. -
  • - -
  • - Configuration files in the mods-enabled/, - conf-enabled/ and sites-enabled/ directories contain - particular configuration snippets which manage modules, global configuration - fragments, or virtual host configurations, respectively. -
  • - -
  • - They are activated by symlinking available - configuration files from their respective - *-available/ counterparts. These should be managed - by using our helpers - - a2enmod, - a2dismod, - - - a2ensite, - a2dissite, - - and - - a2enconf, - a2disconf - . See their respective man pages for detailed information. -
  • - -
  • - The binary is called apache2. Due to the use of - environment variables, in the default configuration, apache2 needs to be - started/stopped with /etc/init.d/apache2 or apache2ctl. - Calling /usr/bin/apache2 directly will not work with the - default configuration. -
  • -
-
- -
-
- Document Roots -
- -
-

- By default, Ubuntu does not allow access through the web browser to - any file apart of those located in /var/www, - public_html - directories (when enabled) and /usr/share (for web - applications). If your site is using a web document root - located elsewhere (such as in /srv) you may need to whitelist your - document root directory in /etc/apache2/apache2.conf. -

-

- The default Ubuntu document root is /var/www/html. You - can make your own virtual hosts under /var/www. This is different - to previous releases which provides better security out of the box. -

-
- -
-
- Reporting Problems -
-
-

- Please use the ubuntu-bug tool to report bugs in the - Apache2 package with Ubuntu. However, check existing - bug reports before reporting a new bug. -

-

- Please report bugs specific to modules (such as PHP and others) - to respective packages, not to the web server itself. -

-
- - - - -
-
-
-

- Valid XHTML 1.0 Transitional -

-
- - -