chore(core): parity with mashape static sites skeleton

brains-platform · Aug 24, 2015 · 587a465 · 587a465
1 parent f3257b5
commit 587a465
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 16 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 .project
 .bundle
 .idea
-npm-debug.log
+*.log
 
 # jekyll
 Gemfile.lock

diff --git a/app/_jekyll_plugins/alias_generator.rb → app/_plugins/alias_generator.rb b/app/_jekyll_plugins/alias_generator.rb → app/_plugins/alias_generator.rb
diff --git a/app/_jekyll_plugins/liquify.rb → app/_plugins/liquify.rb b/app/_jekyll_plugins/liquify.rb → app/_plugins/liquify.rb
diff --git a/app/_jekyll_plugins/markdown.rb → app/_plugins/markdown.rb b/app/_jekyll_plugins/markdown.rb → app/_plugins/markdown.rb
diff --git a/app/_jekyll_plugins/versions.rb → app/_plugins/versions.rb b/app/_jekyll_plugins/versions.rb → app/_plugins/versions.rb
diff --git a/app/sitemap.xml b/app/sitemap.xml
@@ -6,7 +6,7 @@ sitemap: false
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 {% for page in site.pages %}{% if page.sitemap != false %}
   <url>
-    <loc>{{ site.url }}{{ page.url }}</loc>
+    <loc>{{ site.links.web }}{{ page.url }}</loc>
     <lastmod>{{ site.time | date_to_xmlschema}}</lastmod>
     <changefreq>weekly</changefreq>
     <priority>{% if page.kong_version == site.data.kong_latest.release %}2.0{% else %}1.0{%endif%}</priority>

diff --git a/jekyll.yml b/jekyll.yml
@@ -1,3 +1,23 @@
+# Build settings
+source: app
+destination: dist
+permalink: pretty
+timezone: America/San_Francisco
+markdown: redcarpet
+redcarpet:
+  extensions:
+    - fenced_code_blocks
+    - no_intra_emphasis
+    - autolink
+    - with_toc_data
+    - strikethrough
+    - lax_html_blocks
+    - superscript
+    - tables
+
+keep_files:
+  - assets
+
 # Site settings
 name: Kong
 title: Open-Source API and Microservice Management Layer
@@ -11,16 +31,6 @@ repos:
   docs: https://github.com/Mashape/getkong.org
   oauth2_hello_world: https://github.com/Mashape/kong-oauth2-hello-world
 
-# Build settings
-source: app
-destination: dist
-permalink: pretty
-plugins: ./app/_jekyll_plugins
-keep_files: ['assets']
-timezone: America/San_Francisco
-markdown: redcarpet
-redcarpet:
-  extensions: ["fenced_code_blocks", "no_intra_emphasis", "autolink", "with_toc_data", "strikethrough"," lax_html_blocks", "superscript", "tables"]
 defaults:
   -
     scope:
@@ -29,14 +39,14 @@ defaults:
       layout: 'page'
   -
     scope:
-      path: 'about'
+      path: 'docs'
     values:
-      layout: 'about'
+      layout: 'docs'
   -
     scope:
-      path: 'docs'
+      path: 'about'
     values:
-      layout: 'docs'
+      layout: 'about'
   -
     scope:
       path: 'plugins'