resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
terraform/website
History
Ollie Ford ed2b959f7e Fix contradiction in terms with provider documentation (#10815) (#10874) 
* Remove contradiction with Scaleway documentation

The parameters previously termed by Terraform:

1. Organization
2. Access key

Are referred to, respectively, by Scaleway [0] as:

1. Access key
2. Token

which is a confusing contradiction for a user.

Since Scaleway terms (1) both 'access key' [0] and 'organization ID' [1],
@nicolai86 suggested keeping the latter as already used, but changing (2) for
'token'; removing the contradiction.

This commit thus changes the parameters to:

1. Organization
2. Token

Closes #10815.

[0] - https://cloud.scaleway.com/#/credentials
[1] - https://www.scaleway.com/docs/retrieve-my-organization-id-throught-the-api

* Update docs to reflect Scaleway offering x86

Scaleway now provides x86 servers [0] as well as ARM.

This commit removes 'ARM' from various references suggesting that might be the
only option.

[0] - https://blog.online.net/2016/03/08/c2-insanely-affordable-x64-servers/
 		2017-01-17 12:02:55 +00:00
..
scripts Use Docker-based deploys 2016-10-31 18:37:52 -04:00
source Fix contradiction in terms with provider documentation (#10815) (#10874) 2017-01-17 12:02:55 +00:00
Gemfile Use Docker-based deploys 2016-10-31 18:37:52 -04:00
Gemfile.lock Use Docker-based deploys 2016-10-31 18:37:52 -04:00
LICENSE.md
…
Makefile Use Docker-based deploys 2016-10-31 18:37:52 -04:00
README.md Use Docker-based deploys 2016-10-31 18:37:52 -04:00
config.rb v0.8.4 2017-01-11 17:03:56 +00:00
config.ru Add Rack::Protection 2015-07-13 12:50:17 -04:00
packer.json Use Docker-based deploys 2016-10-31 18:37:52 -04:00

README.md

Terraform Website

This subdirectory contains the entire source for the Terraform Website. This is a Middleman project, which builds a static site from these source files.

Contributions Welcome!

If you find a typo or you feel like you can improve the HTML, CSS, or JavaScript, we welcome contributions. Feel free to open issues or pull requests like any normal GitHub project, and we'll merge it in.

Running the Site Locally

To run the site locally, clone this repository and run:

$ make website

You must have Docker installed for this to work.

Alternatively, you can manually run the website like this:

$ bundle
$ bundle exec middleman server

Then open up http://localhost:4567.