haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,184 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

676 Commits

Author SHA1 Message Date
Jurnell Cockhren 86e56aeac3 Revert "Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs." 
This reverts commit 0289ab986c.

Refers to issues #6276, #5973, #5936 and #5435

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
 2015-10-08 15:01:00 -05:00
Jurnell Cockhren 1a7c6dcfeb Revert "Salt Provisioner: refactor custom install_type option to add install_command instead" 
Refers to issues #6276, #5973, #5936 and #5435

This reverts commit 72e63767ac.

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
 2015-10-08 15:01:00 -05:00
Mitchell Hashimoto 94b6755813 website/docs: update docs for snapshotting 2015-10-07 23:03:13 -04:00
Mitchell Hashimoto d519d927fa Merge branch 'VB-linked-clone-support' of https://github.com/mpoeter/vagrant into mpoeter-VB-linked-clone-support 2015-10-06 13:50:34 -04:00
Mitchell Hashimoto 2b732a96c7 website/docs: IPv6 2015-10-01 08:55:03 -04:00
Brian Dwyer 8fb2e0b4a5 Update documentation for Chef Solo `nodes_path` 2015-09-27 23:24:40 -04:00
Daniel Hahler 6b033f2d65 doc: mention "directory" in the file provisioner reference 2015-09-25 15:14:12 +02:00
Sam Handler 094d8b89ef Add 'Edit this page' link to website/www footer 2015-09-24 16:47:14 -07:00
Sam Handler 33d602ba84 Point `website/www` README to Makefile 2015-09-24 16:45:43 -07:00
Sam Handler ab590f7740 Add Makefile to `website/www` 2015-09-24 16:44:54 -07:00
Sam Handler 73314cfcbe Add 'Edit this page' link to website/docs footer 2015-09-24 16:44:08 -07:00
Sam Handler b4bd0c925e Point website/docs README to Makefile and /v2 url 2015-09-24 16:42:27 -07:00
Sam Handler 599feb5d0e Add Makefile to `website/docs` 2015-09-24 16:41:40 -07:00
J Lynn f22bfcb8de resolve formatting issues 2015-09-23 13:58:01 +10:00
J Lynn f3215f0ae6 copied documentation from docs to website for use_dhcp_assigned_default_route in order to complete documentation 2015-09-23 13:29:11 +10:00
tomfanning 41beaac074 Hyper-V set mac address 2015-09-22 11:35:55 +01:00
Seth Vargo 45ab5b4dc5 Update typos in SSH sharing docs 2015-09-16 11:35:17 +01:00
modernlegend 75a7fabaea fix typo, adjust wording for clarity 2015-08-30 19:42:42 -04:00
Seth Vargo aaf679d92b Bump VMware information 2015-08-25 12:41:53 -04:00
Włodzimierz Gajda 2f5b4f0958 Fixed link in destroy command documentation 2015-08-25 16:40:16 +02:00
Chris Bednarski e7ca6acbfe Revert heading change and add note about CHECKPOINT_DISABLE 2015-08-20 14:34:23 -07:00
Chris Bednarski d11ff32370 Change docs for checkpoint environment variable to reflect the not-vagrant-specific version CHECKPOINT_DISABLE 2015-08-19 11:21:43 -07:00
Justin Campbell c58c9a1ffc website/www: Add Atlas box search to nav 2015-08-17 11:29:46 -04:00
Justin Campbell 0f8a88f497 website/www: Fix logos/copyright alignment 
Before:

![](http://cl.ly/image/2g2h0v1Z371r/Screen%20Shot%202015-08-17%20at%2011.22.48%20AM.png)

After:

![](http://cl.ly/image/0s1e2a272o2q/Screen%20Shot%202015-08-17%20at%2011.21.31%20AM.png)
 2015-08-17 11:22:27 -04:00
Justin Campbell 278d08fee4 website/docs: Link to Atlas docs for base boxes 2015-08-17 11:14:26 -04:00
Victor Costan 6f59c8bb54 The docs typo'd the nic_type parameter 
The parameter name in the VirtualBox provider source is nic_type, not nictype.

The typo is probably caused by the fact that the parameter maps to nictype args in the VirtualBox CLI.
 2015-08-15 06:19:51 -04:00
Seth Vargo d1043b41e3 Ensure all assets are served over SSL 2015-08-12 19:33:26 -04:00
Seth Vargo fd526ad3d9 Mention that only X.Y.Z is valid for versions in semver 
Fixes #6052
 2015-08-06 16:06:31 -04:00
Seth Vargo a4a77f279b Update docs to say Vagrant 1.5+ is required 
Fixes #6084
 2015-08-06 15:51:20 -04:00
Casey Lang f13220cd74 Clarify config.ssh.insert_key docs 
Modified the description of `config.ssh.insert_key` a bit to improve readability.
 2015-07-31 14:10:57 -04:00
Brian Dwyer 01f0dccbdc Update documentation for Chef Zero `nodes_path` 2015-07-28 13:25:25 -04:00
Marcello Pogliani c806b55f78 [website] load external scripts without schema 
Avoid loading external stylesheets and scripts over plain HTTP when
using HTTPS (the default in vagrantup.com).
This avoids browsers blocking the external resources due to mixed
content issues when HTTPS is used (e.g., "This page is trying to load
scripts from unauthenticated sources" warning shown in Chrome).
 2015-07-20 00:06:53 +02:00
Pat O'Shea 19b7bbc369 Corrected masterless example 
The basic Vagrantfile file example for a masterless setup doesn't set the masterless value.  That property defaults to false. https://github.com/mitchellh/vagrant/blob/master/plugins/provisioners/salt/provisioner.rb
 2015-07-18 08:39:00 -06:00
Pat O'Shea d6cf70bf20 Clarified windows guest machine support. 
Done at mitchellh's request.
 2015-07-18 08:25:40 -06:00
Mattias Appelgren 27b948f53c website/docs: Add more information regarding Puppet environments 2015-07-18 14:48:03 +02:00
Mitchell Hashimoto 8c2dc41223 website/www: bump 2015-07-17 13:44:57 -07:00
Mitchell Hashimoto 4b217e2128 Merge pull request #5980 from PatOShea/PatOShea-ConfigDir-Typo 
Fixed salt minion configuration directory typo
 2015-07-17 12:37:44 -07:00
Manuel Pöter dbcb513075 Fix typo. 2015-07-16 13:23:57 +02:00
Mitchell Hashimoto bac5d039db providers/docker: pull setting, default false [GH-5932] 2015-07-15 11:08:01 -07:00
Mitchell Hashimoto 2209d7621b Merge pull request #5956 from mitchellh/sethvargo/rack_protection 
Add Rack::Protection to sites
 2015-07-13 08:50:24 -07:00
Seth Vargo b03b7f56a0 Add Rack::Protection to sites 2015-07-13 11:49:21 -04:00
Mitchell Hashimoto 1f1bbbfbb8 website/docs: note Vagrant version for NFS aliases [GH-5942] 2015-07-13 08:42:35 -07:00
Manuel Pöter f4d1d068f9 Merge branch 'master' into VB-linked-clone-support 2015-07-13 10:56:17 +02:00
Mitchell Hashimoto 7743b8314d website 2015-07-10 17:07:17 -06:00
Mitchell Hashimoto 799fff6bc8 website/www: use bintray API 2015-07-10 17:00:01 -06:00
Mitchell Hashimoto 9d5727b738 website/www: up for deploy 2015-07-10 16:51:43 -06:00
Mitchell Hashimoto 0fa6b17bfb website/www: fix for new bintray format 2015-07-10 16:45:46 -06:00
Mitchell Hashimoto 58ccb48899 website: update Ruby version 2015-07-10 16:33:47 -06:00
Kevin Fishner 53dddeb2b8 targeting scripts 2015-07-10 15:21:00 -06:00
Seth Vargo 00f1e46777 Update docs to support VirtualBox 5 2015-07-10 13:17:36 -06:00
Gilles Cornu 247fe72068 docs: update ansible provisioner guide [GH-5765] 
[ci skip]
 2015-07-10 17:36:05 +02:00
Gilles Cornu df4b74ee54 provisioners/ansible: update doc for GH-5765 (wip) 2015-07-10 08:51:17 +02:00
Seth Vargo 68ef9676c7 Jailbreak out of the subprocess and restore original environment 2015-07-09 16:06:03 -06:00
Mitchell Hashimoto d51c5fbc69 Merge pull request #5435 from juiceinc/bugfix/salt-provisioner 
Update Salt provisioner to allow more flexibility in passing arguments to the bootstrap script
 2015-07-09 15:02:34 -06:00
Seth Vargo 912a878840 Merge pull request #5910 from mitchellh/sethvargo/preserve_original_env 
Add Vagrant.original_env and break out of bundler in subprocess
 2015-07-09 13:19:49 -06:00
Seth Vargo e46ef7d2f8 Document debugging the launcher 2015-07-09 13:14:38 -06:00
Mitchell Hashimoto 7e61afd480 website/docs: clarify rsync options hash 
:: Please enter the commit message for your changes. Lines starting
 2015-07-09 11:08:07 -06:00
Mitchell Hashimoto ac8c3fffc8 website/docs: doc options for NFS [GH-5583] 2015-07-09 10:39:33 -06:00
Mitchell Hashimoto 31448d126b synced_folders/rsync: can set rsync_path [GH-3966] 2015-07-09 10:02:38 -06:00
Mitchell Hashimoto 26b5b67a6c website: update docs for SMB disconnect [GH-4538] 2015-07-09 09:55:18 -06:00
Mitchell Hashimoto 0440779d8f website: clarify NFS mount options [GH-4858] 2015-07-09 09:51:46 -06:00
Mitchell Hashimoto c1508cd893 kernel/v2: customizable sudo_command [GH-5573] 2015-07-09 09:30:47 -06:00
Mitchell Hashimoto 5f121c44e2 update CHANGELOG 2015-07-08 16:08:51 -06:00
Mitchell Hashimoto 5e02e9cc89 website/docs: update for docker restart 2015-07-07 12:17:55 -06:00
Mitchell Hashimoto 3600698891 website/docs: warning about choosing IP that overlaps [GH-4430] 2015-07-06 23:26:20 -06:00
Mitchell Hashimoto 2632a0a948 website/docs: fix typo 2015-07-06 23:24:59 -06:00
Mitchell Hashimoto f37d9ab0d6 website/docs: heuristic for what can be single line config [GH-4603] 2015-07-06 23:24:03 -06:00
Mitchell Hashimoto da0b24ecda website/docs: update dns proxy docs [GH-4853] 2015-07-06 23:22:22 -06:00
Mitchell Hashimoto 5c0e9dc68d website/docs: note that d.run only once [GH-4885] 2015-07-06 23:20:21 -06:00
Mitchell Hashimoto e003b45f9c website: update docs about NFS encryption [GH-4987] 2015-07-06 23:19:18 -06:00
Mitchell Hashimoto 0df41d5d01 website: fix docs typo [GH-4885] 2015-07-06 23:14:48 -06:00
Mitchell Hashimoto bf8ce6ee5f website/docs: clarify hyper-v box creation [GH-5419] 2015-07-06 23:11:15 -06:00
Mitchell Hashimoto f5dd9ec604 website/docs: document nictype [GH-5812] 2015-07-06 23:02:11 -06:00
Mitchell Hashimoto ddfd321597 website: clarify symlinks [GH-5844] 2015-07-06 23:00:05 -06:00
Mitchell Hashimoto 39bee1c0c6 website: clarify plugininstallation [GH-5848] 2015-07-06 22:57:53 -06:00
Pat O'Shea c6a49defab Update salt options 
Added details about what works for windows and what doesn't, fixed typo, broke runners out from states, added 3 options (version, masterless, and minion_id).
 2015-07-06 20:36:21 -06:00
Mitchell Hashimoto cbf70bbd67 website/docs: update background command info 2015-07-06 14:07:00 -06:00
Mitchell Hashimoto 0762e73531 website: docs for GH-5356 2015-07-06 12:01:34 -06:00
Manuel Pöter 2717f5605a Document use_linked_clone property for VirtualBox provider. 2015-06-08 18:03:03 +02:00
Seth Vargo 72fe7d045d Merge pull request #5801 from jjasghar/patch-2 
Update chef_solo.html.md
 2015-06-06 12:10:50 -04:00
JJ Asghar 1b75dfd562 Update chef_solo.html.md 
Updated to the new chef.io site.
 2015-06-05 15:36:17 -05:00
JJ Asghar 2870d299de Update chef_client.html.md 
Updated to the new chef.io site.
 2015-06-05 15:34:07 -05:00
Igor Vuk b072e8bcf5 Fix a typo in ssh_settings.html.md 2015-06-04 19:58:56 +02:00
Sebastian Schuberth 5ad6b7e553 website: Improve description to enable Hyper-V on Windows 8.1 
The step to click on "Turn Windows features on or off" was missing.
 2015-06-02 10:05:39 +02:00
Tim O'Guin 72e63767ac Salt Provisioner: refactor custom install_type option to add install_command instead 2015-06-01 10:37:41 -05:00
Tim O'Guin 0b24866537 merged in master and resolved conflict in Salt provisioner docs 2015-06-01 10:07:28 -05:00
Seth Vargo 1413cd56cf Merge pull request #5626 from brooksbrown/smb-docs-update 
Added a note on PowerShell to prerequisites SMB documentation.
 2015-05-31 20:53:01 -07:00
Seth Vargo 13b8cda214 Merge pull request #5544 from bdwyertech/bdwyertech-patch-1 
VMware Documentation Fix - SED Syntax
 2015-05-31 20:41:57 -07:00
Seth Vargo 6309847420 Merge pull request #5512 from johnsonj/issue_3620 
For SMB on Linux guests, specify the user's domain as a separate parameter
 2015-05-31 20:19:08 -07:00
Dmitry Moskalchuk 26e3994319 Add option to enable trusted HTTP redirects 2015-05-31 09:34:02 -07:00
Seth Vargo d8285653e2 Remove extra newline 2015-05-30 21:26:40 -07:00
John Cooper 342eb4fa36 Added doc for puppet.synced_folder_args 2015-05-30 21:26:06 -07:00
Seth Vargo f9816d89d9 Merge pull request #4867 from malonecm/GH4201-ShowRSyncOutput 
GH-4201: Added rsync__showoutput to display rsync output to console
 2015-05-30 21:21:26 -07:00
Seth Vargo 25486f0d41 Merge pull request #5680 from c33s/favicon 
added favicon for www & doc
 2015-05-30 21:21:04 -07:00
Seth Vargo a68155c996 Merge pull request #5638 from dmangot/master 
fix master_config documentation
 2015-05-30 21:20:32 -07:00
Seth Vargo 6bfee51389 Update CHANGELOG and docs for Puppet 4 environments support 2015-05-30 21:17:28 -07:00
Seth Vargo ea08ef8ff8 Merge pull request #5592 from notpeter/master 
Add documentation for salt bootstrap script config parameter.
 2015-05-30 21:01:20 -07:00
Seth Vargo afc02ed681 Merge pull request #5607 from purpleidea/feat/named-shell 
Add :name attribute to shell provisioner.
 2015-05-30 20:54:34 -07:00
Seth Vargo 710d1d9770 Update docs for handling a list of NICs 2015-05-30 20:48:33 -07:00
Seth Vargo f2733ab631 bundler, not bundle 2015-05-30 20:44:59 -07:00