dev env config

Signed-off-by: leecalcote <[email protected]>

Makefile

@@ -1,11 +1,11 @@
 jekyll=bundle exec jekyll
 
 site:
-	$(jekyll) serve --drafts --livereload
+	$(jekyll) serve --drafts --livereload --config _config.yml,_config_dev.yml
 
 # With Jekyll Manager interface
 site-admin:
-	ADMIN=on $(jekyll) serve --drafts --livereload
+	ADMIN=on $(jekyll) serve --drafts --livereload --config _config.yml,_config_dev.yml
 
 build:
 	$(jekyll) build --drafts 
@@ -14,4 +14,4 @@ setup:
 	ADMIN=on bundle install
 
 docker:
-	docker run --name layer5 --rm -p 4000:4000 -v `pwd`:"/srv/jekyll" jekyll/jekyll:4.0.0 bash -c "bundle install; jekyll serve --drafts --livereload"
+	docker run --name layer5 --rm -p 4000:4000 -v `pwd`:"/srv/jekyll" jekyll/jekyll:4.0.0 bash -c "bundle install; jekyll serve --drafts --livereload --config _config.yml,_config_dev.yml"

_config.yml

@@ -52,11 +52,9 @@ plugins:
   - jekyll-redirect-from
   - jekyll-archives
 
-jekyll-archives:
-  enabled: []
-  layout: default
-  permalinks:
-    all: '/'
+# This logic is included based on differences of the handling of trailing slashes between Jekyll and GitHub Pages
+permalinks:
+ - meshery: "/meshery"
 
 collections_dir: collections
 collections:

_config_dev.yml

@@ -0,0 +1,228 @@
+title: Layer5
+author: Lee Calcote
+email: [email protected]
+name:  Layer5
+description: "the service mesh community - making service meshes available to the rest of us.
+ Open source software for management of service meshes.
+ Allowing developers to focus on business logic, not infrastructure concerns.
+ Empowering operators to confidentally run modern infrastructure."
+url: "https://layer5.io"
+baseurl: # if your site is located at /blog or /home, enter it here, otherwise leave it empty
+
+parallax_image_one: assets/images/layer5-logo.gif #-header-large.jpg # These are the images used for the parallax background
+parallax_image_two: assets/images/startup3.jpg
+
+portfolio_heading: Workshops
+portfolio_type: cards
+
+project_button: Github
+
+session: Session
+
+#Contact / Social
+github: https://github.com/layer5io
+medium: https://layer5.io
+slack: http://slack.layer5.io/
+blog: https://layer5.io/blog
+docker: https://hub.docker.com/u/layer5/
+youtube: https://www.youtube.com/channel/UCFL1af7_wdnhHXL1InzaMvA?sub_confirmation=1
+twitter:
+  card: summary
+  username: layer5
+  url: "https://twitter.com/layer5"
+  image: "https://layer5.io/assets/images/layer5/5-dark-bg.png"
+
+# Google tracking, if both are filled, tag manager will prevail. Set up GA through GTM in that case
+tag_manager_id: # This looks something like GTM-XXXXXXX
+google_analytics_tracking_id: UA-2969471-4 # This looks something like UA-000000000-0 Head over to https://analytics.google.com/ to setup.
+
+syntax_highlighting: true # include the css for syntax highlighting
+
+# Build settings
+# theme: minima
+paginate: 5
+markdown: kramdown
+permalink: pretty
+plugins:
+  - jekyll-feed
+  - jekyll-assets
+  - jekyll-minifier
+  - jekyll-sitemap
+  - jekyll-seo-tag
+  # This commenting is included based on differences of the handling of trailing slashes between Jekyll and GitHub Pages
+  #- jekyll-redirect-from
+  - jekyll-archives
+
+collections_dir: collections
+collections:
+  authors:
+    output: true
+  books:
+    output: true
+    permalink: /books/:title
+  blogs:
+    output: true
+    permalink: /blog/:title
+  news:
+    output: true
+    permalink: /news/:title
+  pages:
+    output: true
+  people:
+    output: true
+  projects:
+    output: true
+    permalink: /projects/:title
+  topics:
+    output: true
+    permalink: /topics/:title
+  workshops:
+    output: true
+    permalink: /workshops/:title
+defaults:
+  - scope:
+      path: ""
+    values:
+      image: /assets/images/layer5/layer5-tag-linkedin.png
+  - scope:
+      type: pages
+      path: ""
+    values:
+      layout: default
+      body-class: left-sidebar
+      sidebar: open
+  - scope:
+      type: books
+      path: ""
+    values:
+      layout: default
+      body-class: left-sidebar
+      sidebar: open
+    # Collection defaults
+
+# Colors
+layer5:
+  gray: "#3c494f"
+  lightgray: "#a0aaaa"
+  darkgreen: "#00b39f"
+  lightgreen: "#00d3a9"
+
+
+## Reference - OSS this site uses:
+    # Particles - http://www.fabiolamanna.it
+    # Nav menu - https://github.com/vinnymoreira/stellarnav
+    # Jekyll theme - https://github.com/jameshamann/jekyll-material-theme
+    # https://github.com/VincentGarreau/particles.js
+    # https://cssgradient.io
+    # https://coolbackgrounds.io
+    # Image view - https://jekyllcodex.org/without-plugin/lightbox/
+
+## A message to have visitors acknowledge use of cookies (not currently used)
+# cookies_banner: none # The value "show" will show the cookies banner, the value "none" will hide the banner.
+# cookie_accept_message: Thank you. Enjoy!
+
+## Skill icons from https://konpa.github.io/devicon/ (not currently used)
+# icon_size: 50 # font-size of icons in px
+# colored: colored # Leave blank for black and white icons
+
+#skills: 
+#    - name: docker
+#   - name: android
+#   - name: angularjs
+#   - name: apache
+#   - name: appcelerator
+#   - name: apple
+#   - name: atom
+#   - name: babel
+#   - name: backbonejs
+#   - name: bitbucket
+#   - name: bootstrap
+#   - name: bower
+#   - name: c
+#   - name: chrome
+#   - name: codeigniter
+#   - name: coffescript
+#   - name: confluence
+#   - name: cplusplus
+#   - name: csharp
+#   - name: css3
+#   - name: cucumber
+#   - name: d3js
+#   - name: debian
+#   - name: devicon
+#   - name: django
+#   - name: docker
+#   - name: doctrine
+#   - name: dot-net
+#   - name: drupal
+#   - name: erlang
+#   - name: facebook
+#   - name: firefox
+#   - name: foundation
+#   - name: gatling
+#   - name: gimp
+#   - name: git
+#   - name: github
+#   - name: gitlab
+#   - name: go
+#   - name: google
+#   - name: gradle
+#   - name: grunt
+#   - name: gulp
+#   - name: heroku
+#   - name: html5
+#   - name: ie10
+#   - name: illustrator
+#   - name: inkscape
+#   - name: itellij
+#   - name: java
+#   - name: jasmine
+#   - name: javascript
+#   - name: laravel
+#   - name: less
+#   - name: linux
+#   - name: meteor
+#   - name: mocha
+#   - name: mongodb
+#   - name: moodle
+#   - name: mysql
+#   - name: nginx
+#   - name: nodejs
+#   - name: nodewebkit
+#   - name: oracle
+#   - name: photoshop
+#   - name: php
+#   - name: phpstorm
+#   - name: protractor
+#   - name: postgresql
+#   - name: python
+#   - name: pycharm
+#   - name: rails
+#   - name: react
+#   - name: redhat
+#   - name: redis
+#   - name: ruby
+#   - name: rubymine
+#   - name: safari
+#   - name: sass
+#   - name: sequelize
+#    - name: slack
+#   - name: sourcetree
+#   - name: ssh
+#   - name: swift
+#   - name: symfony
+#   - name: tomcat
+#   - name: travis
+#   - name: trello
+#   - name: twitter
+#   - name: typescript
+#   - name: ubuntu
+#   - name: vim
+#   - name: visualstudio
+#   - name: vuejs
+#   - name: webpack
+#   - name: webstorm
+#   - name: windows8
+#   - name: wordpress
+#   - name: yii
+#   - name: zend

collections/_pages/landscape.html

@@ -1,3 +1,7 @@
+{% if jekyll.environment == 'production' %}
+  {% assign page.redirect_from = "landscape/" %}
+{% endif %}
+
 ---
 layout: default
 title:  "Service Mesh Landscape"
@@ -7,10 +11,9 @@
   twitter: layer5
 lang: en
 permalink: /landscape
+redirect_from:
+  - landscape
 ---
-{% if jekyll.environment == 'production' %}
-  {% assign page.redirect_from = "landscape/" %}
-{% endif %}
 
 <div style="
 background-image: url('/assets/images/mesh-cubes-trans.svg');

collections/_pages/meshery.html

@@ -23,10 +23,6 @@
   - title: Does Meshery manage service meshes?
     content: Yes, Meshery acts as a management plane to provision and manage the lifecycle of service meshes.
 ---
-{% if jekyll.environment == "development" %}
-  {% assign page.permalink = "/meshery" %}
-{% endif %}
-
 <div class="container" style="position:relative;z-index: 1;">
     <div class="col s10">
     <div style="text-align:center;padding:0;margin:0;">

collections/_pages/news.md

@@ -4,7 +4,7 @@ layout: plain
 permalink: /news
 redirect_from:
 - /company/news
-
+- /news/
 excerpt: "News and Press about Layer5"
 ---
 {% include collections/news-list.html %}

collections/_pages/partners.md

@@ -2,6 +2,7 @@
 layout: page
 title:  "Layer5 Partners"
 permalink: /partners
+redirect_from: partners/
 excerpt: "Layer5 Community - Partners"
 ---
 

collections/_pages/projects.md

@@ -2,6 +2,7 @@
 layout: default
 title:  "Layer5 Projects"
 permalink: /projects
+redirect_from: projects/
 excerpt: "Layer5 Community - Projects"
 ---
 

collections/_pages/resources.md

@@ -2,6 +2,7 @@
 layout: plain
 title:  "Resources"
 permalink: /resources
+redirect_from: resources/
 excerpt: "Resources"
 ---
 

collections/_pages/subscribe.html

@@ -1,5 +1,6 @@
 ---
 layout: plain
 permalink: /subscribe
+redirect_from: subscribe/
 ---
 {% include newsletter-signup.html %}