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

27 Commits

Author SHA1 Message Date
Seth Vargo 5093f3120e Merge docs and www into a single static site 
This is a big commit, and I apologize in advance for the future
git-blames all pointing to me. This commit does a few things:

1.  Merges the website/docs and website/www repo into a single website repo
    to be in line with other HashiCorp projects
2.  Updates to use middleman-hashicorp
3.  Converts less to scss to be in line with other projects
4.  Updates page styles to be in line with other projects
5.  Optimizes images
6.  Prepare for S3 + Fastly deployment with scripts, etc.
7.  Removes blog posts (they have been transferred to hashicorp.com with
    redirects in place
8.  Updated sitemap generation script for better SEO
9.  Fixed many broken links
10. Add description to all fields
 2016-01-19 14:35:05 -05:00
Mitchell Hashimoto cfc5914ca2 website/docs: fix typo [GH-6227] 2015-11-18 18:20:34 -08:00
Mitchell Hashimoto c43e0af4d7 Merge pull request #6382 from sophicware/fix/salt-provisioner-install-args 
[salt] [bugfix] Restablize Salt provisioner
 2015-11-18 15:19:02 -08:00
Mitchell Hashimoto ba3100f836 Merge pull request #6383 from PatOShea/patch-5 
Document windows minion requirement for ipc_mode
 2015-11-18 14:20:16 -08:00
Mitchell Hashimoto d83d614331 Merge pull request #5993 from PatOShea/patch-2 
website/docs: Corrected masterless example for salt provisioner in documentation
 2015-11-18 11:28:57 -08:00
Karthik Gaekwad 2124b85b92 fixes simple spelling errors 2015-10-31 16:47:31 -05:00
Pat O'Shea 1b19ce1cc3 Add windows minion requirement for ipc_mode 
If this is not set to tpc, then the minion will fail to communicate with the master.
 2015-10-08 23:56:34 -06:00
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
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
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
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
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 a68155c996 Merge pull request #5638 from dmangot/master 
fix master_config documentation
 2015-05-30 21:20:32 -07:00
Dave Mangot 25639ab6c2 fix master_config documentation 2015-04-26 12:25:36 -07:00
Peter Tripp ef45f7c52e Add documentation for salt bootstrap script config parameter. 2015-04-13 12:57:58 -07:00
Tim O'Guin 0289ab986c Salt Provisioner: Added a 'custom' option to install_type to allow more flexibility in passing arguments to the bootstrap script. Updated the docs. 2015-03-04 15:05:24 -07:00
Mitchell Hashimoto 5a7abc2b2f website/docs: update salt docs 2015-02-24 09:32:55 -08:00
mafro a4724521f5 added bootstrap_options param to the salt provisioner docs 2015-02-14 09:56:54 +11:00
Ken Crowell 72afdce630 Issue #4895: Support grains config for salt 2014-12-02 18:01:09 -04:00
Marno van der Molen 6d0dd22864 Also copy minion config in bootstrap-salt.ps1 & update Salt docs to mention syndic/master not supported on Windows 2014-05-19 14:01:31 +02:00
Mitchell Hashimoto f6683ad016 website/docs: update slat docs 2014-05-01 13:49:12 -07:00
deyk 567af495d4 Add colorization and log_level support to salt provisioner. 
This commit adds two new options to the salt provisioner:

- `colorize`: controls color output. Defaults to no-color (present behavior).
- `log_level`: controls log level. Defaults to `debug` (present behavior).

Docs included!
 2014-05-01 11:10:09 -07:00
Jeremy Felt fdfd09b632 Add CentOS 'testing' argument for install_type 
The Salt bootstrap file allows for the use of a testing repository in CentOS systems.
 2013-11-05 09:36:45 -08:00
Jeff Singer 2c267e0960 Adding salt documention to resolve #2315 2013-10-03 17:17:41 -04:00