Cleanup docs and build for registry

.hashibot.hcl

@@ -46,7 +46,7 @@ behavior "pull_request_size_labeler" "size" {
 
 behavior "pull_request_path_labeler" "cross_provider_labels" {
     label_map = {
-        "documentation" = ["website/**/*"]
+        "documentation" = ["docs/**/*"]
         "dependencies" = ["vendor/**/*"]
     }
 }

.travis.yml

@@ -25,7 +25,6 @@ script:
 - make test
 - make testacc
 - make vet
-- make website-test
 
 branches:
   only:

GNUmakefile

@@ -1,6 +1,5 @@
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
-WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=http
 
 default: build
@@ -45,19 +44,4 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
-website:
-ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
-	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
-	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
-endif
-	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
-
-website-test:
-ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
-	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
-	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
-endif
-	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
-
-.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test
-
+.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile

website/docs/data_source.html.md → docs/data-sources/http.md

@@ -1,7 +1,5 @@
 ---
-layout: "http"
 page_title: "HTTP Data Source"
-sidebar_current: "docs-http-data-source"
 description: |-
   Retrieves the content at an HTTP or HTTPS URL.
 ---

website/docs/index.html.markdown → docs/index.md

@@ -1,7 +1,5 @@
 ---
-layout: "http"
-page_title: "Provider: HTTP"
-sidebar_current: "docs-http-index"
+page_title: "HTTP Provider"
 description: |-
   The HTTP provider interacts with HTTP servers.
 ---