From 0fe4708ecfae5bf381fc3fd6e2279634ae6be281 Mon Sep 17 00:00:00 2001 From: Anna Wiggins Date: Wed, 4 Dec 2019 20:24:14 -0500 Subject: [PATCH] Rip out categories entirely, various bits of cleanup, and put all posts on the main page (for now). --- Dockerfile | 8 +++++++- Makefile | 8 +++++--- _config.yml | 22 +++------------------- _data/top_links.yml | 4 ++-- _includes/category_menu_top.html | 9 --------- _includes/footer.html | 6 ------ _includes/icon-github.html | 1 - _includes/icon-github.svg | 1 - _includes/post_list.html | 28 +++++++++++++--------------- _includes/post_list_main.html | 18 ------------------ index.html | 17 +---------------- pages/about.md | 2 +- 12 files changed, 32 insertions(+), 92 deletions(-) delete mode 100644 _includes/category_menu_top.html delete mode 100644 _includes/icon-github.html delete mode 100644 _includes/icon-github.svg delete mode 100644 _includes/post_list_main.html diff --git a/Dockerfile b/Dockerfile index 1d3b638..4a1385d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,8 @@ +FROM jekyll/jekyll as build + +WORKDIR /src +COPY . /src +jekyll build + FROM nginx -COPY _site /usr/share/nginx/html +COPY --from=build /src/_site /usr/share/nginx/html diff --git a/Makefile b/Makefile index ebf1be8..3503f18 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ DOCKER_IMAGE := cr.annabunch.es/annabunches-static -all: site +all: build -site: - jekyll build +serve: + docker run --rm -it -p 4000:4000 -v $(shell pwd):/srv/jekyll jekyll/jekyll jekyll serve --drafts --future --safe -d /tmp/site --trace + +build: docker build -t ${DOCKER_IMAGE} . push: diff --git a/_config.yml b/_config.yml index fa22851..aaf1f80 100644 --- a/_config.yml +++ b/_config.yml @@ -8,14 +8,13 @@ # Site settings title: Anna and the Bunches email: annabunches@gmail.com -description: > # this means to ignore newlines until "baseurl:" +description: > The story of Anna and her lifelong friends, Left Bunch and Right Bunch. The power... the passion... the danger. Their courage will change the world. -baseurl: "" # the subpath of your site, e.g. /blog -url: "http://annabunch.es" # the base hostname & protocol for your site +baseurl: "" +url: "https://annabunch.es" twitter_username: annabunches github_username: annabunches -exclude: ["_posts/**/*.asc"] permalink: none timezone: America/New_York @@ -23,21 +22,6 @@ timezone: America/New_York # Build settings markdown: kramdown -# Category settings -category_metadata: - technology: - title: "The Technologist" - description: This section of the blog is where I talk about technology. Tutorials, rants, and discussions about programming languages, operating systems, hardware, and more. - main: true - media: - title: "The Player of Games" - description: Here I talk about media. Video games, tabletop games, movies, TV. - main: true - religion: - title: "The Mystic" - description: Discussions of my adventures with faith, spirituality, truth, and magic. Lots of woo here. - main: false - defaults: - scope: path: "" diff --git a/_data/top_links.yml b/_data/top_links.yml index 706d423..6c4a8d5 100644 --- a/_data/top_links.yml +++ b/_data/top_links.yml @@ -1,5 +1,5 @@ - title: GPG Key - url: https://keybase.io/annabunches/pgp_keys.asc?fingerprint=82b1fcf343081be8e78826cf2b856f73efef6022 + url: https://annabunch.es/public_key.asc - title: Site Source - url: http://github.com/annabunches/annabunch.es + url: https://git.annabunch.es/annabunches/annabunch.es diff --git a/_includes/category_menu_top.html b/_includes/category_menu_top.html deleted file mode 100644 index f260038..0000000 --- a/_includes/category_menu_top.html +++ /dev/null @@ -1,9 +0,0 @@ -
- {% for category in site.category_metadata %} - - - {{ category.last["title"] }} - - - {% endfor %} -
diff --git a/_includes/footer.html b/_includes/footer.html index 8ff2203..f2101e3 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -11,12 +11,6 @@