deploy test gopherhole

.github/workflows/build-and-deploy.yml

@@ -69,20 +69,32 @@ jobs:
         with:
           node-version: '14'
       - name: install dependencies
-        run: bundle install
-      - name: build jekyll site
-        run: bundle exec jekyll build
+        run: make install
+      - name: build http site
+        run: make http
+      - name: build gopher hole
+        run: make gopher
       - name: install surge
         run: npm install -g surge
-      - name: deploy to surge
-        run: surge ./_site --token ${{secrets.SURGE_TOKEN}}
-      - name: deploy to server
+      - name: deploy site to surge
+        run: surge ./_http --token ${{secrets.SURGE_TOKEN}}
+      - name: deploy site to server
         uses: burnett01/rsync-deployments@5.0
         with:
           switches: -avzr --delete
-          path: _site/
+          path: _http/
           remote_path: /opt/stack/volumes/caddy/site/flower.codes/
           remote_host: ${{ secrets.REMOTE_HOST }}
           remote_user: deploy
           remote_key: ${{ secrets.SSH_KEY }}
+          remote_key_pass : ${{ secrets.SSH_KEY_PASSPHRASE }}
+      - name: deploy gopherhole to server
+        uses: burnett01/rsync-deployments@5.0
+        with:
+          switches: -avzr --delete
+          path: _gopher/
+          remote_path: /opt/stack/volumes/gopher/hole/
+          remote_host: ${{ secrets.REMOTE_HOST }}
+          remote_user: deploy
+          remote_key: ${{ secrets.SSH_KEY }}
           remote_key_pass : ${{ secrets.SSH_KEY_PASSPHRASE }}

.gitignore

@@ -1,4 +1,5 @@
-_site
+_http
+_gopher
 .sass-cache
 .jekyll-cache
 .jekyll-metadata

Gemfile

@@ -14,10 +14,9 @@ gem "jekyll", github: "jekyll/jekyll"
 # 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!
+
 group :jekyll_plugins do
-  # gem 'jekyll-commonmark'
-  gem "jekyll-include-cache"
+  # If you have any plugins, put them here!
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/jekyll/jekyll.git
-  revision: 55b6972ea73e683bee69c8f72aa69bc4425f4519
+  revision: ca2f106c8f26f28604b2e2feb580812a5d1013ec
   specs:
     jekyll (4.2.0)
       addressable (~> 2.4)
@@ -46,8 +46,6 @@ GEM
     http_parser.rb (0.6.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jekyll-include-cache (0.2.1)
-      jekyll (>= 3.7, < 5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
@@ -64,7 +62,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     mini_portile2 (2.6.1)
-    nokogiri (1.12.1)
+    nokogiri (1.12.2)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     nokogumbo (2.0.5)
@@ -98,7 +96,6 @@ DEPENDENCIES
   commonmarker
   html-proofer
   jekyll!
-  jekyll-include-cache
   liquid-c
   tzinfo (~> 1.2)
   tzinfo-data

Makefile

@@ -0,0 +1,28 @@
+SHELL := /bin/bash
+BUNDLE := bundle
+JEKYLL := $(BUNDLE) exec jekyll
+
+PROJECT_DEPS := Gemfile
+
+.PHONY: all clean install update
+
+all: http gopher
+
+install: $(PROJECT_DEPS)
+	$(BUNDLE) install
+
+update: $(PROJECT_DEPS)
+	$(BUNDLE) update
+
+http: install
+	$(JEKYLL) build --config _config.http.yml
+
+gopher: install
+	$(JEKYLL) build --config _config.gopher.yml
+
+serve: install
+	$(JEKYLL) serve --config _config.http.yml
+
+clean:
+	$(JEKYLL) clean --config _config.http.yml
+	$(JEKYLL) clean --config _config.gopher.yml

README.md

@@ -1,7 +1,3 @@
 # flower.codes
 
 I write things sometimes.
-
-## TODO
-
-- Convert relative image paths to absolute image paths in UncommonMark

_config.gopher.yml

@@ -0,0 +1,29 @@
+# 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.
+#
+# If you need help with YAML syntax, here are some quick references for you:
+# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
+# https://learnxinyminutes.com/docs/yaml/
+#
+# 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: flower.codes
+author: Zachary Flower
+email: zach@flower.codes
+description: Impostor.
+baseurl: ""
+url: "gopher://flower.codes"
+
+source: gopher
+destination: _gopher

_config.http.yml

@@ -23,12 +23,13 @@ author: Zachary Flower
 email: zach@flower.codes
 description: Impostor.
 baseurl: ""
-url: "https://flower.codes"
+url: "http://flower.codes"
+
+source: http
+destination: _http
 
 # Build settings
 markdown: UncommonMark
-plugins:
-  - jekyll-include-cache
 
 uncommonmark:
   options: ["FOOTNOTES"]
@@ -53,7 +54,6 @@ compress_html:
 #
 exclude:
   - README.md
-  - LICENSE
 #   - .sass-cache/
 #   - .jekyll-cache/
 #   - gemfiles/

blogroll.md

@@ -1,7 +0,0 @@
----
-layout: page
-title: Blogroll
-regenerate: true
----
-
-- [~dustin](https://tilde.town/~dustin/)

goals.md

@@ -1,15 +0,0 @@
----
-layout: page
-title: Goals
-regenerate: true
----
-
-01. [Personal](#personal)
-01. [Professional](#professional)
-01. [Financial](#financial)
-
-## Personal
-
-## Professional
-
-## Financial

gopher/README.md

@@ -0,0 +1,3 @@
+# gopher://flower.codes
+
+I write things sometimes.

gopher/_includes/post_list.liquid

@@ -0,0 +1,19 @@
+{%- if include.category -%}
+	{%- assign posts = site.categories[include.category] -%}
+{%- else -%}
+	{%- assign posts = site.posts -%}
+{%- endif -%}
+
+{%- for post in posts  -%}
+{%- capture this_year -%}{{ post.date | date: "%Y" }}{%- endcapture -%}
+{%- capture next_year -%}{{ post.previous.date | date: "%Y" }}{%- endcapture -%}
+{%- if forloop.first -%}
+i> {{this_year}}	/
+{% endif -%}
+0{{post.title}}	{{post.url}}
+{%- unless forloop.last -%}
+{%- if this_year != next_year -%}
+i> {{next_year}}	/
+{% endif -%}
+{%- endunless -%}
+{%- endfor -%}

gopher/_layouts/home.liquid

@@ -0,0 +1,3 @@
+{{ content }}
+
+{% include post_list.liquid %}

gopher/_layouts/post.liquid

@@ -0,0 +1 @@
+{{ content }}

gopher/_posts/2019-08-04-hello-world.txt

@@ -0,0 +1,7 @@
+---
+layout: post
+title: Hello, World!
+date: 2019-08-04 14:39:00
+---
+
+Word.

gopher/_posts/2020-08-04-hello-world.txt

@@ -0,0 +1,7 @@
+---
+layout: post
+title: Hello, World!
+date: 2020-08-04 14:39:00
+---
+
+Word.

gopher/_posts/2020-08-05-hello-world.txt

@@ -0,0 +1,7 @@
+---
+layout: post
+title: Hello, World!
+date: 2020-08-05 14:39:00
+---
+
+Word.

gopher/_posts/2021-07-05-hello-world.txt

@@ -0,0 +1,7 @@
+---
+layout: post
+title: Hello, World!
+date: 2021-07-05 14:39:00
+---
+
+Word.

gopher/_posts/2021-08-05-hello-world.txt

@@ -0,0 +1,7 @@
+---
+layout: post
+title: Hello, World!
+date: 2021-08-05 14:39:00
+---
+
+Word.

gopher/gophermap.txt

@@ -0,0 +1,3 @@
+---
+layout: home
+---

http/README.md

@@ -0,0 +1,7 @@
+# http://flower.codes
+
+I write things sometimes.
+
+## TODO
+
+- Convert relative image paths to absolute image paths in UncommonMark