Move doc files into new structure

Author: Andre Moeller

GNUmakefile

@@ -70,8 +70,8 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
 endif
 	(cd $(GOPATH)/src/$(WEBSITE_REPO); \
-	  ln -fs ../../../ext/providers/$(PKG_NAME)/website/$(PKG_NAME).erb content/source/layouts/$(PKG_NAME).erb; \
-	  ln -Fs ../../../../ext/providers/$(PKG_NAME)/website/docs content/source/docs/providers/$(PKG_NAME) \
+	  ln -fs ../../../ext/providers/$(PKG_NAME)/$(PKG_NAME).erb content/source/layouts/$(PKG_NAME).erb; \
+	  ln -Fs ../../../../ext/providers/$(PKG_NAME)/docs content/source/docs/providers/$(PKG_NAME) \
 	)
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 
@@ -81,8 +81,8 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
 	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
 endif
 	(cd $(GOPATH)/src/$(WEBSITE_REPO); \
-	  ln -fs ../../../ext/providers/$(PKG_NAME)/website/$(PKG_NAME).erb content/source/layouts/$(PKG_NAME).erb; \
-	  ln -Fs ../../../../ext/providers/$(PKG_NAME)/website/docs content/source/docs/providers/$(PKG_NAME) \
+	  ln -fs ../../../ext/providers/$(PKG_NAME)/$(PKG_NAME).erb content/source/layouts/$(PKG_NAME).erb; \
+	  ln -Fs ../../../../ext/providers/$(PKG_NAME)/docs content/source/docs/providers/$(PKG_NAME) \
 	)
 	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
 

website/docs/d/blobstore.html.markdown docs/data-sources/blobstore.md

@@ -23,7 +23,7 @@ const (
 	cloudMark      = "nexus"
 	cloudTitle     = "Nexus"
 	cloudMarkShort = "nexus"
-	docRoot        = "../website/docs"
+	docRoot        = "../docs"
 )
 
 func main() {
@@ -259,7 +259,7 @@ func genDoc(dtype, fpath, name string, resource *schema.Resource) {
 	}
 	data["attributes"] = strings.Join(attributes, "\n")
 
-	fname = fmt.Sprintf("%s/%s/%s.html.markdown", docRoot, dtype[0:1], data["resource"])
+	fname = fmt.Sprintf("%s/%ss/%s.md", docRoot, strings.ReplaceAll(dtype, "_", "-"), data["resource"])
 	fd, err := os.OpenFile(fname, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 	if err != nil {
 		log.Printf("[FAIL!]open file %s failed: %s", fname, err)

website/docs/d/data_source_blobstore.html.markdown docs/data-sources/data_source_blobstore.md

@@ -13,57 +13,57 @@
           <a href="#">Data Sources</a>
           <ul class="nav nav-visible">
             <li<%= sidebar_current("data_source_blobstore") %>>
-              <a href="/docs/providers/nexus/d/data_source_blobstore.html">data_source_blobstore</a>
+              <a href="/docs/providers/nexus/data-sources/data_source_blobstore.html">data_source_blobstore</a>
             </li>
             <li<%= sidebar_current("data_source_privileges") %>>
-              <a href="/docs/providers/nexus/d/data_source_privileges.html">data_source_privileges</a>
+              <a href="/docs/providers/nexus/data-sources/data_source_privileges.html">data_source_privileges</a>
             </li>
             <li<%= sidebar_current("data_source_repository") %>>
-              <a href="/docs/providers/nexus/d/data_source_repository.html">data_source_repository</a>
+              <a href="/docs/providers/nexus/data-sources/data_source_repository.html">data_source_repository</a>
             </li>
             <li<%= sidebar_current("data_source_security_ldap") %>>
-              <a href="/docs/providers/nexus/d/data_source_security_ldap.html">data_source_security_ldap</a>
+              <a href="/docs/providers/nexus/data-sources/data_source_security_ldap.html">data_source_security_ldap</a>
             </li>
             <li<%= sidebar_current("data_source_security_realms") %>>
-              <a href="/docs/providers/nexus/d/data_source_security_realms.html">data_source_security_realms</a>
+              <a href="/docs/providers/nexus/data-sources/data_source_security_realms.html">data_source_security_realms</a>
             </li>
             <li<%= sidebar_current("data_source_user") %>>
-              <a href="/docs/providers/nexus/d/data_source_user.html">data_source_user</a>
+              <a href="/docs/providers/nexus/data-sources/data_source_user.html">data_source_user</a>
             </li>
           </ul>
         </li>
         <li<%= sidebar_current("docs-nexus-resource") %>>
         <a href="#">Resources</a>
         <ul class="nav nav-visible">
             <li<%= sidebar_current("resource_blobstore") %>>
-              <a href="/docs/providers/nexus/r/resource_blobstore.html">resource_blobstore</a>
+              <a href="/docs/providers/nexus/resources/resource_blobstore.html">resource_blobstore</a>
             </li>
             <li<%= sidebar_current("resource_content_selector") %>>
-              <a href="/docs/providers/nexus/r/resource_content_selector.html">resource_content_selector</a>
+              <a href="/docs/providers/nexus/resources/resource_content_selector.html">resource_content_selector</a>
             </li>
             <li<%= sidebar_current("resource_privilege") %>>
-              <a href="/docs/providers/nexus/r/resource_privilege.html">resource_privilege</a>
+              <a href="/docs/providers/nexus/resources/resource_privilege.html">resource_privilege</a>
             </li>
             <li<%= sidebar_current("resource_repository") %>>
-              <a href="/docs/providers/nexus/r/resource_repository.html">resource_repository</a>
+              <a href="/docs/providers/nexus/resources/resource_repository.html">resource_repository</a>
             </li>
             <li<%= sidebar_current("resource_role") %>>
-              <a href="/docs/providers/nexus/r/resource_role.html">resource_role</a>
+              <a href="/docs/providers/nexus/resources/resource_role.html">resource_role</a>
             </li>
             <li<%= sidebar_current("resource_script") %>>
-              <a href="/docs/providers/nexus/r/resource_script.html">resource_script</a>
+              <a href="/docs/providers/nexus/resources/resource_script.html">resource_script</a>
             </li>
             <li<%= sidebar_current("resource_security_ldap") %>>
-              <a href="/docs/providers/nexus/r/resource_security_ldap.html">resource_security_ldap</a>
+              <a href="/docs/providers/nexus/resources/resource_security_ldap.html">resource_security_ldap</a>
             </li>
             <li<%= sidebar_current("resource_security_ldap_order") %>>
-              <a href="/docs/providers/nexus/r/resource_security_ldap_order.html">resource_security_ldap_order</a>
+              <a href="/docs/providers/nexus/resources/resource_security_ldap_order.html">resource_security_ldap_order</a>
             </li>
             <li<%= sidebar_current("resource_security_realms") %>>
-              <a href="/docs/providers/nexus/r/resource_security_realms.html">resource_security_realms</a>
+              <a href="/docs/providers/nexus/resources/resource_security_realms.html">resource_security_realms</a>
             </li>
             <li<%= sidebar_current("resource_user") %>>
-              <a href="/docs/providers/nexus/r/resource_user.html">resource_user</a>
+              <a href="/docs/providers/nexus/resources/resource_user.html">resource_user</a>
             </li>
         </ul>
         </li>

website/docs/d/data_source_privileges.html.markdown docs/data-sources/data_source_privileges.md

@@ -7,7 +7,7 @@
 
 #!/bin/bash
 
-cat > website/nexus.erb << EOI
+cat > nexus.erb << EOI
 <% wrap_layout :inner do %>
   <% content_for :sidebar do %>
     <div class="docs-sidebar hidden-print affix-top" role="complementary">
@@ -33,11 +33,11 @@ do
 
   if [[ "$res" =~ "resource" ]]
   then
-    typeShort="r"
+    typeUrl="resources"
     typeLong="resource"
     if [[ "${writingDataSources}" == true ]]
     then
-      cat >> website/nexus.erb << EOI
+      cat >> nexus.erb << EOI
           </ul>
         </li>
         <li<%= sidebar_current("docs-nexus-resource") %>>
@@ -47,15 +47,15 @@ EOI
       writingDataSources=false
     fi
   else
-    typeShort="d"
+    typeUrl="data-sources"
     typeLong="data"
   fi
 
   echo $res
 
-  if [[ ! -f website/docs/$typeShort/$res.html.markdown ]]
+  if [[ ! -f docs/$typeUrl/$res.md ]]
   then
-    cat > website/docs/$typeShort/${res}.html.markdown << EOI
+    cat > docs/$typeUrl/${res}.md << EOI
 ---
 layout: "nexus"
 page_title: "Nexus: $res"
@@ -83,14 +83,14 @@ data "scaffolding_data_source" "example" {
 EOI
   fi
 
-  cat >> website/nexus.erb << EOI
+  cat >> nexus.erb << EOI
             <li<%= sidebar_current("$res") %>>
-              <a href="/docs/providers/nexus/$typeShort/${res}.html">$res</a>
+              <a href="/docs/providers/nexus/$typeUrl/${res}.html">$res</a>
             </li>
 EOI
 done
 
-cat >> website/nexus.erb << EOI
+cat >> nexus.erb << EOI
         </ul>
         </li>
       </ul>