[WIP] Federalist prep #1430

gboone · 2015-12-30T23:02:45Z

This pull request preps 18f.gsa.gov to use the Federalist platform. The short term goal is to use the previewing feature for, among other things, blog post drafting. The long term goal is to fully host the site on the platform. Outstanding issues blocking that include:

Integration of 18F/Dashboard at {{ site.baseurl }}/dashboard/or dashboard.18f.gov
Ensuring there are no baseurl-less URLs, images, links, scripts, etc. kicking around.
Clearing out all html files that might be edited as content (convert them to markdown)
Understanding any implications this move might have for our ssl configuration, compliance, or other devops concerns. AFAIK there are none but this, especially compliance, is always a concern.
Figure out how to get URLs to respond with or without the trailing slash ({{ site.baseurl }}/team vs {{ site.baseurl }}/team/)

Preview branch: https://federalist.18f.gov/preview/18F/18f.gsa.gov/federalist-prep/

houndci-bot · 2015-12-30T23:03:15Z

_plugins/team.rb

@@ -2,12 +2,13 @@ module Jekyll
  module TeamFilter
    def team_photo(name)
      person = finder(name)
+      baseurl = Jekyll.sites[0].config['baseurl']


Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

gboone · 2015-12-30T23:06:15Z

Aaand Travis failed showing all our internal links as broken. Interesting. Looks like I have a todo list for tomorrow.

houndci-bot · 2016-01-08T20:32:48Z

_plugins/author.rb

@@ -97,8 +98,9 @@ def lookup(input, args)
    def team_link(input)
      team = Jekyll.sites[0].collections['team'].docs
      index = team.find_index {|x| x.data['name'] == input}
+      baseurl = Jekyll.sites[0].config['baseurl']


Useless assignment to variable - baseurl.
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.

houndci-bot · 2016-01-08T20:55:38Z

_plugins/author.rb

        full_name = team[index].data['full_name']
-        string = "<a href=#{url}>#{full_name}</a>"
+        string = "<a href='#{url}'>#{full_name}</a>"


Useless assignment to variable - string.

houndci-bot · 2016-01-08T21:00:41Z

_plugins/related_posts.rb

@@ -38,7 +39,7 @@ def list_posts(other_posts)
      internal = @params[1] || "li"
      if other_posts
        related_posts = "<#{external}>"
-        other_posts.flatten.map { |post| related_posts << "<#{internal}><a href='#{post.url}' class='related_posts'>&ldquo;#{post.data['title']}&rdquo;</a></#{internal}>" }
+        other_posts.flatten.map { |post| related_posts << "<#{internal}><a href='#{@baseurl}#{post.url}' class='related_posts'>&ldquo;#{post.data['title']}&rdquo;</a></#{internal}>" }


Line is too long. [183/80]

Since the post.url appends a / we don't need to separate it from baseurl with one.

gboone · 2016-01-08T22:41:28Z

OK. I think this is ready to merge. Before making the full cutover we need to:

Get Dashboard squared away at dashboard.18f.gov
Redirect all current /dashboard pages to their corresponding URL on dashboard.18f.gov
Fix this trailing slash thing. All internal links include a trailing slash but it'd be great if someone could type https://18f.gsa.gov/blog into their blog and not get a weird file download instead of the blog.

dlapiduz · 2016-01-08T22:52:17Z

@sharms is working on helping the dashboard team move to dashboard.18f.gov btw

gboone · 2016-01-11T19:00:46Z

Awesome. @sharms look forward to working with you on that :) Work has begun here: 18F/dashboard#339 happy to discuss our hopes and dreams, fears and anxieties, there.

gboone · 2016-01-11T22:22:32Z

OK, the trailing slash thing I think is a problem only with the preview URLs. If you go to the S3 bucket directly, the downloading problem doesn't happen. Hat tip to @shawnbot for helping figure this out. If you navigate directly to .../blog on the S3 bucket it properly redirects to .../blog/.

konklone · 2016-01-13T19:45:02Z

As a note, another thing we should bear in mind about moving to ELBs is we will not be able to do OCSP stapling.

The lack of stapling is what causes the unencrypted OCSP request to ocsp.x1-int.letsencrypt.org here: http://www.webpagetest.org/result/160113_2S_1207/1/details/ It's also one of the third party services I originally proposed documenting.

Stapling for 18f.gsa.gov only stalled because, at the time we were talking about it, nginx had done a very confusing and incomplete job of implementing it, but that has been addressed in recent versions of nginx and there are clear best practices now.

It's up to Amazon to enable OCSP stapling for ELBs, and I haven't heard anything from them about doing this. They do have it enabled for CloudFront.

gboone · 2016-01-20T23:18:25Z

We can safely merge this without affecting the existing hosting environment. That will at least give us the advantage of preview branches and potentially the editor while we figure out how to move forward on these remaining issues.

dhcole · 2016-01-28T21:47:53Z

_layouts/tag_index.html

@@ -10,7 +10,7 @@
    {% for post in page.posts %}
        <article class="tag-index">
          <div class="blog-title">
-            <h1 itemprop="headline" class="h4"><a class="link-alt" href="{{ post.url }}">{{ post.title }}</a></h1>
+            <h1 itemprop="headline" class="h4"><a class="link-alt" a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></h1>


Extraneous a attribute in the anchor tag

dhcole · 2016-01-28T21:57:53Z

Nice work @gboone. Looks great to me! 🚢 🚀

[WIP] Federalist prep

dhcole · 2016-01-28T23:17:30Z

@gboone to close out the rest of this conversation, the hosting piece, I set up the proxy. It's available here: https://18f-site.18f.gov/

It's running as the app 18f-site in the federalist org, prod space on cloud.gov. It's proxy with 2 instances for redundancy, so it should be ready to go.

To switch the main domain to this proxy, there are two steps:

Change the custom domain in the Federalist site settings to https://18f.gsa.gov and change the BASE_DOMAIN ENV var to 18f.gsa.gov for the 18f-site cloud.gov app. @jeremiak can help with this.
You'd need to add a route for 18f.gsa.gov to the cloud.gov app and set up an ELB to terminate the SSL cert, and adjust the DNS settings to point to that ELB. @dlapiduz should be able to help with that — it's all standard procedure for custom domain cloud.gov applications.

Also the proxy repo is now here: https://github.com/18F/cg-s3-proxy and is deployed with the following ENV vars:

BASE_DOMAIN: 18f-site.18f.gov
PROXY_ROOT: http://federalist.18f.gov.s3-website-us-east-1.amazonaws.com/site/18F/18f.gsa.gov

dhcole · 2016-01-28T23:19:26Z

Also, at that point, you may want to switch your default branch in Federalist from staging to production.

Greg Boone added 20 commits December 30, 2015 08:55

Adds a baseurl and updates relevant tempaltes and plugins

c8d023c

Reverts changes to head, config

d3919aa

Adds baseurl to first md post in the site

e939cfe

Should link the stylesheet in Federalist

d927c6d

Brings in the other includes with baseurl

c0df275

Baseurls for common layouts, remove an unused layout

f48e329

Removes a double slash from layout urls

1c5cd41

Moar basurls

f25af88

Base URLs a bunch of pages

7751abe

Moar pages with baseurls

05b0922

Fixes a liquid syntax error.

afad3a3

Merge branch 'staging' into federalist-prep

47a1423

baseurl's Mike's post

516e054

Fixes the homepage image links

3069151

Fixes some double slash problems in the home page

ed2c7ec

Super find and replace!

2d63c55

Trailing slash for nav links

7d39e91

Fixes the team_photo filter

cba26ac

Fixes the link to the logo in the photo filter

93a8da3

More base urls in posts, eps. html images

110704b

houndci-bot reviewed Dec 30, 2015
View reviewed changes

Greg Boone added 3 commits January 8, 2016 14:12

Links to /blog/ instead of /news/

363f70b

Baseurl for GSA's logo

62bc1da

Should find a better way to write these plugins some day

0277aad

houndci-bot reviewed Jan 8, 2016
View reviewed changes

Greg Boone added 2 commits January 8, 2016 14:36

Finally getting this baseurl thing nailed down

a40c5ea

Finally got the authors plugin patched up

2af9b81

houndci-bot reviewed Jan 8, 2016
View reviewed changes

No more double slashes on related post links

ecd112a

houndci-bot reviewed Jan 8, 2016
View reviewed changes

Greg Boone added 3 commits January 8, 2016 16:30

Scrubs out some html conversion artifacts

1d06c71

Tag index h1 link fixed

e6891ad

Since the post.url appends a / we don't need to separate it from baseurl with one.

trailing slashes for author links

4b4ee81

dhcole reviewed Jan 28, 2016
View reviewed changes

Stray a-s

0364781

dhcole added a commit that referenced this pull request Jan 28, 2016

Merge pull request #1430 from 18F/federalist-prep

d8d6f3a

[WIP] Federalist prep

dhcole merged commit d8d6f3a into staging Jan 28, 2016

gboone deleted the federalist-prep branch January 28, 2016 21:58

dhcole mentioned this pull request Jan 29, 2016

Add HSTS support to Federalist S3 setup cloud-gov/pages-core#161

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Federalist prep #1430

[WIP] Federalist prep #1430

gboone commented Dec 30, 2015

houndci-bot Dec 30, 2015

gboone commented Dec 30, 2015

houndci-bot Jan 8, 2016

houndci-bot Jan 8, 2016

houndci-bot Jan 8, 2016

gboone commented Jan 8, 2016

dlapiduz commented Jan 8, 2016

gboone commented Jan 11, 2016

gboone commented Jan 11, 2016

konklone commented Jan 13, 2016

gboone commented Jan 20, 2016

dhcole Jan 28, 2016

dhcole commented Jan 28, 2016

dhcole commented Jan 28, 2016

dhcole commented Jan 28, 2016

[WIP] Federalist prep #1430

[WIP] Federalist prep #1430

Conversation

gboone commented Dec 30, 2015

houndci-bot Dec 30, 2015

Choose a reason for hiding this comment

gboone commented Dec 30, 2015

houndci-bot Jan 8, 2016

Choose a reason for hiding this comment

houndci-bot Jan 8, 2016

Choose a reason for hiding this comment

houndci-bot Jan 8, 2016

Choose a reason for hiding this comment

gboone commented Jan 8, 2016

dlapiduz commented Jan 8, 2016

gboone commented Jan 11, 2016

gboone commented Jan 11, 2016

konklone commented Jan 13, 2016

gboone commented Jan 20, 2016

dhcole Jan 28, 2016

Choose a reason for hiding this comment

dhcole commented Jan 28, 2016

dhcole commented Jan 28, 2016

dhcole commented Jan 28, 2016