From b1323be8ca1d58e49e310128c2a2ac9fbceef2a3 Mon Sep 17 00:00:00 2001 From: leecalcote Date: Sun, 16 Feb 2020 22:58:14 -0600 Subject: [PATCH] dev env config Signed-off-by: leecalcote --- Makefile | 6 +- _config.yml | 8 +- _config_dev.yml | 228 ++++++++++++++++++++++++++++++ collections/_pages/landscape.html | 9 +- collections/_pages/meshery.html | 4 - collections/_pages/news.md | 2 +- collections/_pages/partners.md | 1 + collections/_pages/projects.md | 1 + collections/_pages/resources.md | 1 + collections/_pages/subscribe.html | 1 + 10 files changed, 245 insertions(+), 16 deletions(-) create mode 100644 _config_dev.yml diff --git a/Makefile b/Makefile index c819d400f454..4a7b7653b550 100644 --- a/Makefile +++ b/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" diff --git a/_config.yml b/_config.yml index 600e3bb6349d..0c8a2556d9b7 100644 --- a/_config.yml +++ b/_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: diff --git a/_config_dev.yml b/_config_dev.yml new file mode 100644 index 000000000000..ebd2e4b32947 --- /dev/null +++ b/_config_dev.yml @@ -0,0 +1,228 @@ +title: Layer5 +author: Lee Calcote +email: community@layer5.io +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 diff --git a/collections/_pages/landscape.html b/collections/_pages/landscape.html index a5e3e9d6d3f5..9d020de820fd 100644 --- a/collections/_pages/landscape.html +++ b/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 %}
diff --git a/collections/_pages/news.md b/collections/_pages/news.md index 304aad1a13ad..b86715989355 100644 --- a/collections/_pages/news.md +++ b/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 %} \ No newline at end of file diff --git a/collections/_pages/partners.md b/collections/_pages/partners.md index d63d0050b40c..04a70e03fe79 100644 --- a/collections/_pages/partners.md +++ b/collections/_pages/partners.md @@ -2,6 +2,7 @@ layout: page title: "Layer5 Partners" permalink: /partners +redirect_from: partners/ excerpt: "Layer5 Community - Partners" --- diff --git a/collections/_pages/projects.md b/collections/_pages/projects.md index 20aea09da9ac..b86d82ed6d97 100644 --- a/collections/_pages/projects.md +++ b/collections/_pages/projects.md @@ -2,6 +2,7 @@ layout: default title: "Layer5 Projects" permalink: /projects +redirect_from: projects/ excerpt: "Layer5 Community - Projects" --- diff --git a/collections/_pages/resources.md b/collections/_pages/resources.md index 72e7704d9ff4..f82b8d35b5e7 100644 --- a/collections/_pages/resources.md +++ b/collections/_pages/resources.md @@ -2,6 +2,7 @@ layout: plain title: "Resources" permalink: /resources +redirect_from: resources/ excerpt: "Resources" --- diff --git a/collections/_pages/subscribe.html b/collections/_pages/subscribe.html index a1635c50e745..8edcee558166 100644 --- a/collections/_pages/subscribe.html +++ b/collections/_pages/subscribe.html @@ -1,5 +1,6 @@ --- layout: plain permalink: /subscribe +redirect_from: subscribe/ --- {% include newsletter-signup.html %} \ No newline at end of file