Various changes

.gitignore

@@ -4,6 +4,8 @@ blog-ideas.txt
 build/
 google7b85d9382e3547d5.html
 logs/
+**/.jekyll-cache
+**/.jekyll-cache/*
 **/.sass-cache
 **/.sass-cache/*
 tweets/

Gemfile

@@ -1,18 +1,13 @@
 source "https://rubygems.org"
 
+# synk
 gem "nokogiri", "~> 1.8.1"
 gem "rack-protection", "~> 2.0.0"
 
+# jekyll
 gem "jekyll", "3.6.2"
 
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-#gem "minima", "~> 2.0"
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
-
-# If you have any plugins, put them here!
+# jekyll plugins
 group :jekyll_plugins do
    gem "jekyll-archives"
    gem "jekyll-compose"
@@ -23,4 +18,3 @@ group :jekyll_plugins do
    gem "jekyll-sitemap"
    gem "liquid_reading_time"
 end
-

_config.yml

@@ -1,21 +1,6 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely edit after that. If you find
-# yourself editing this file very often, consider using Jekyll's data files
-# feature for the data you need to update frequently.
-#
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.myvariable }}.
 title: ian.io
 email: [email protected]
-description: > # this means to ignore newlines until "baseurl:"
+description: >
   Father, husband, web infrastructure wrangler @venntro & private.
   Enjoyer of bacon, maple syrup, craft beer, whiskey, pizza, rugby,
   owls, lemurs & hair loss.🍍 🇬🇧 🇨🇦
@@ -43,8 +28,8 @@ plugins:
 jekyll-archives:
   enabled:
     - year
-      #    - month
-      #    - day
+    #- month
+    #- day
     - tags
   permalinks:
     year: '/:year/'
@@ -70,15 +55,11 @@ collections:
     permalink: /:collection/:path/
 
 # SEO
-google_site_verification: '59BTkh1X9dhznapAPhfrT13e-QlJRRvz7B28YjTO2-U'
 google_analytics: 'UA-54222-12'
-
 twitter:
   username: ian_winter
-
 facebook:
   admins: 506344573
-
 social:
   name: Ian Winter
   links:
@@ -88,19 +69,16 @@ social:
     - https://github.com/ianwinter
     - https://keybase.io/ian_winter
 
-# Exclude from processing.
-# The following items will not be processed, by default. Create a custom list
-# to override the default setting.
-
 exclude:
   - Rakefile
   - README.md
   - .bundle/
   - .DS_Store
   - Gemfile
   - Gemfile.lock
+  - .jekyll-cache/
   - node_modules
-  - script/
+  - _scripts/
   - vendor/bundle/
   - vendor/cache/
   - vendor/gems/

_includes/footer.html

@@ -1,9 +1,10 @@
-<footer class="site-footer">
+<footer class="site-footer h-card">
+  <data class="u-url" href="{{ "/" | relative_url }}"></data>
 
   <div class="wrapper">
 
     <div class="footer-col-wrapper">
-      <div class="footer-col footer-col-1">
+      <div class="footer-col footer-col-1 p-name">
         <img src="https://ian.io/img/315sq.jpg" style="border-radius: 50%;" height="90" width="90" />
       </div>
 
@@ -12,13 +13,13 @@
           <a href="/feed.xml" title="RSS Feed"><svg aria-labelledby="simpleicons-rss-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           	<title id="simpleicons-rss-icon">RSS icon</title><path class="rss"
           		d="M19.199 24C19.199 13.467 10.533 4.8 0 4.8V0c13.165 0 24 10.835 24 24h-4.801zM3.291 17.415c1.814 0 3.293 1.479 3.293 3.295 0 1.813-1.485 3.29-3.301 3.29C1.47 24 0 22.526 0 20.71s1.475-3.294 3.291-3.295zM15.909 24h-4.665c0-6.169-5.075-11.245-11.244-11.245V8.09c8.727 0 15.909 7.184 15.909 15.91z"/></svg></a>
-          <a href="https://twitter.com/ian_winter" title="@ian_winter on Twitter" rel="me"><svg aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+          <a href="https://twitter.com/ian_winter" title="@ian_winter on Twitter" class="u-url" rel="me"><svg aria-labelledby="simpleicons-twitter-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           	<title id="simpleicons-twitter-icon">Twitter icon</title><path class="twitter"
           		d="M23.954 4.569c-.885.389-1.83.654-2.825.775 1.014-.611 1.794-1.574 2.163-2.723-.951.555-2.005.959-3.127 1.184-.896-.959-2.173-1.559-3.591-1.559-2.717 0-4.92 2.203-4.92 4.917 0 .39.045.765.127 1.124C7.691 8.094 4.066 6.13 1.64 3.161c-.427.722-.666 1.561-.666 2.475 0 1.71.87 3.213 2.188 4.096-.807-.026-1.566-.248-2.228-.616v.061c0 2.385 1.693 4.374 3.946 4.827-.413.111-.849.171-1.296.171-.314 0-.615-.03-.916-.086.631 1.953 2.445 3.377 4.604 3.417-1.68 1.319-3.809 2.105-6.102 2.105-.39 0-.779-.023-1.17-.067 2.189 1.394 4.768 2.209 7.557 2.209 9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63.961-.689 1.8-1.56 2.46-2.548l-.047-.02z"/></svg></a>
           <a href="https://www.linkedin.com/in/ianwinter" title="ianwinter on LinkedIn" rel="me"><svg aria-labelledby="simpleicons-linkedin-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           	<title id="simpleicons-linkedin-icon">LinkedIn icon</title><path class="linkedin"
           		d="M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z"/></svg></a>
-          <a href="https://github.com/ianwinter" title="ianwinter on GitHub" rel="me"><svg aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+          <a href="https://github.com/ianwinter" title="ianwinter on GitHub" class="u-url" rel="me"><svg aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
           	<title id="simpleicons-github-icon">GitHub icon</title><path class="github"
           		d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg></a>
           <a href="https://keybase.io/ian_winter" title="ian_winter on keybase.io" rel="me"><svg aria-labelledby="simpleicons-keybase-icon" role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

_includes/head.html

@@ -3,9 +3,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link async="true" rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
-  {% if page.original %}<link rel="canonical" href="{{ page.original }}">{% else %}<link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">{% endif %}
-  <link rel="self" href="{{ page.url | replace:'index.html','' | absolute_url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ "/feed.xml" | relative_url }}">
+  <link rel="self" href="{{ page.url | replace:'index.html','' | absolute_url }}">
   {% seo %}
   {% if jekyll.environment == 'production' and site.google_analytics %}
   {% include google-analytics.html %}

_includes/header.html

@@ -1,7 +1,7 @@
 <header class="site-header" role="banner">
 
   <div class="wrapper">
-    <a class="site-title" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
+    <a class="site-title" rel="author" href="{{ "/" | relative_url }}">{{ site.title | escape }}</a>
 
     <nav class="site-nav">
       <input type="checkbox" id="nav-trigger" class="nav-trigger" />
@@ -23,6 +23,12 @@
         <a class="page-link" href="/diabetes/">Diabetes</a>
         <a class="page-link" href="/projects/">Projects</a>
         <a class="page-link" href="/tweets/">Tweets</a>
+        <form action="https://www.google.com/search" role="search">
+          <div style="margin-right:8px;">
+            <input type="hidden" name="as_sitesearch" value="ian.io">
+            <input type="search" placeholder="Search..." id="search" name="q">
+          </div>
+        </form>
       </div>
     </nav>
   </div>

_layouts/default.html

@@ -9,6 +9,6 @@
       </div>
     </main>
     {% include footer.html %}
+    <script async="true" src="/assets/js/custom.js"></script>
   </body>
-  <script src="/assets/js/custom.js"></script>
 </html>

_layouts/post.html

@@ -1,17 +1,17 @@
 ---
 layout: default
 ---
-<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
+<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting">
 
   <header class="post-header">
-    <h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
+    <h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}</h1>
     <p class="post-meta">
-      <time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
+      <time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">
         {% assign date_format = site.minima.date_format | default: "%b %-d, %Y" %}
         {{ page.date | date: date_format }}
       </time>
       {% if page.author %}
-        • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>
+        • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span class="p-author h-card" itemprop="name">{{ page.author }}</span></span>
       {% endif %}
       {% assign tags = page.tags %}
       {% if page.tags.size > 0 %}
@@ -24,7 +24,7 @@ <h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
     </p>
   </header>
 
-  <div class="post-content" itemprop="articleBody">
+  <div class="post-content e-content" itemprop="articleBody">
     {{ content }}
   </div>
 
@@ -37,7 +37,5 @@ <h1 class="post-title" itemprop="name headline">{{ page.title | escape }}</h1>
     {% endif %}
   </div>
 
-  {% if site.disqus.shortname %}
-    {% include disqus_comments.html %}
-  {% endif %}
+  <a class="u-url" href="{{ page.url | relative_url }}" hidden></a>
 </article>

_posts/2010-06-28-sphinx-part-1.md

@@ -9,15 +9,15 @@ tags:
 - sphinx
 status: publish
 type: post
-original: https://dev.venntro.com/2010/06/sphinx-part-1/
+canonical_url: https://dev.venntro.com/2010/06/sphinx-part-1/
 published: true
 author: iwinter
 meta:
   _edit_last: "2"
   _pingme: "1"
   _encloseme: "1"
   _wp_old_slug: ""
-original: https://dev.venntro.com/2010/06/sphinx-part-1/
+canonical_url: https://dev.venntro.com/2010/06/sphinx-part-1/
 ---
 <p>As part of our continued growth one of the main problems we came across was how to keep our searches running as quickly as possible so our members could find their perfect match easily. As the application grew some of the search queries running against MySQL were becoming complex and taking longer than we'd like to complete.</p>
 

_posts/2010-06-28-spot-the-ball.md

@@ -7,7 +7,7 @@ tags:
 - monitoring
 status: publish
 type: post
-original: https://dev.venntro.com/2010/06/spot-the-ball/
+canonical_url: https://dev.venntro.com/2010/06/spot-the-ball/
 published: true
 author: iwinter
 meta:

_posts/2010-06-28-ssl-or-is-it.md

@@ -9,7 +9,7 @@ tags:
 - ssl
 status: publish
 type: post
-original: https://dev.venntro.com/2010/06/ssl-or-is-it/
+canonical_url: https://dev.venntro.com/2010/06/ssl-or-is-it/
 published: true
 author: iwinter
 meta:

_posts/2010-07-07-sphinx-part-2.md

@@ -7,7 +7,7 @@ tags:
 - sphinx
 status: publish
 type: post
-original: https://dev.venntro.com/2010/07/sphinx-part-2/
+canonical_url: https://dev.venntro.com/2010/07/sphinx-part-2/
 published: true
 author: iwinter
 meta:

_posts/2010-09-16-coldfusion-isolation-levels-and-mysql-5-1.md

@@ -8,7 +8,7 @@ tags:
 - replication
 status: publish
 type: post
-original: https://dev.venntro.com/2010/09/coldfusion-isolation-levels-and-mysql-5-1/
+canonical_url: https://dev.venntro.com/2010/09/coldfusion-isolation-levels-and-mysql-5-1/
 published: true
 author: iwinter
 meta:

_posts/2011-10-04-svn-merge-woes-or-why-we-need-git.md

@@ -7,7 +7,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2011/10/svn-merge-woes-or-why-we-need-git/
+canonical_url: https://dev.venntro.com/2011/10/svn-merge-woes-or-why-we-need-git/
 author: iwinter
 meta:
   _edit_last: "2"

_posts/2013-01-03-migrating-memcached.md

@@ -9,7 +9,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2013/01/migrating-memcached/
+canonical_url: https://dev.venntro.com/2013/01/migrating-memcached/
 ---
 
 As part of the pre-Christmas push we rolled out a series of

_posts/2015-06-04-build-your-own-yum-repo.md

@@ -8,7 +8,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2015/06/build-your-own-yum-repo/
+canonical_url: https://dev.venntro.com/2015/06/build-your-own-yum-repo/
 summary: >
   A summary of how to build and manage your own Yum repository to get
   around the challenges of packages being removed, or, to tie specific

_posts/2016-01-14-issues-with-typhoeus-curl-and-ssl.md

@@ -9,7 +9,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2016/01/issues-with-typhoeus-curl-and-ssl/
+canonical_url: https://dev.venntro.com/2016/01/issues-with-typhoeus-curl-and-ssl/
 summary: >
   How to resolve SSL CA certificate errors with typhoeus, curl and SSL.
 ---

_posts/2017-06-02-enable-github-protected-branches.md

@@ -8,7 +8,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2017/06/enable-github-protected-branches/
+canonical_url: https://dev.venntro.com/2017/06/enable-github-protected-branches/
 summary: >
   A quick script to enable protected branches for all repositories in GitHub
 ---

_posts/2017-10-26-automating-the-build-and-deployment-of-our-team-site-with-jekyll-github-travis-s3-and-cloudfront.md

@@ -10,7 +10,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2017/10/automating-the-build-and-deployment-of-our-team-site-with-jekyll-github-travis-s3-and-cloudfront/
+canonical_url: https://dev.venntro.com/2017/10/automating-the-build-and-deployment-of-our-team-site-with-jekyll-github-travis-s3-and-cloudfront/
 summary: >
   An overview of how and why we chose to automate the build of the dev.venntro.com site
   and move it to a different hosting solution.

_posts/2017-10-30-adding-http-headers-with-lambda-edge.md

@@ -8,7 +8,7 @@ tags:
 status: publish
 type: post
 published: true
-original: https://dev.venntro.com/2017/10/adding-http-headers-with-lambda-edge/
+canonical_url: https://dev.venntro.com/2017/10/adding-http-headers-with-lambda-edge/
 summary: >
   A brief overview of how we used Lambda@Edge to add custom HTTP headers to our static
   site hosted with CloudFront and S3.

_scripts/build

@@ -0,0 +1,23 @@
+#!/bin/sh
+set -e
+
+echo "Starting build"
+
+# build the site
+echo " => building site"
+bundle exec jekyll build --incremental
+
+# uncomment if you're using webmentions
+#echo " => sending webmentions"
+#bundle exec jekyll webmention
+
+# uncomment if you're using cloudflare
+#echo " => purging cloudflare"
+#curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${CLOUDFLARE_ZONEID}/purge_cache" \
+#     -H "X-Auth-Email: [email protected]" \
+#     -H "X-Auth-Key: ${CLOUDFLARE_AUTHKEY}" \
+#     -H "Content-Type: application/json" \
+#     --data '{"purge_everything":true}'
+
+echo " = complete"
+