From dc8c74238e37100ea5d33c8c3665556035c43657 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Thu, 4 May 2023 20:31:53 -0700
Subject: [PATCH] website deploy is a thing

---
 Makefile              | 3 ++-
 infra/main/main.tf    | 2 +-
 infra/main/website.tf | 2 +-
 src/website           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5810553..d7f3892 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,8 @@ $(OUT_DIR)/website/.well-known/openpgpkey:
 			<(cat $(patsubst %,$(KEY_DIR)/%.asc,$(KEYS))) \
 	")
 
-$(OUT_DIR)/website/index.html:
+$(OUT_DIR)/website/index.html: \
+	$(OUT_DIR)/website/.well-known/openpgpkey
 	$(call toolchain," \
 		cd $(SRC_DIR)/website \
 		&& jekyll build \
diff --git a/infra/main/main.tf b/infra/main/main.tf
index 95b3fca..2e9d495 100644
--- a/infra/main/main.tf
+++ b/infra/main/main.tf
@@ -3,7 +3,7 @@ variable "namespace" {}
 variable "region" {}
 variable "out_dir" {
   type    = string
-  default = "/home/build/out"
+  default = "../../out"
 }
 
 resource "random_id" "suffix" {
diff --git a/infra/main/website.tf b/infra/main/website.tf
index a3ccc4e..2cce262 100644
--- a/infra/main/website.tf
+++ b/infra/main/website.tf
@@ -4,7 +4,7 @@ resource "digitalocean_spaces_bucket" "website" {
 }
 
 resource "digitalocean_spaces_bucket_object" "website" {
-  for_each = fileset("${var.out_dir}/website", "*")
+  for_each = fileset("${var.out_dir}/website", "**")
   region   = var.region
   bucket   = digitalocean_spaces_bucket.website.name
   source   = "${var.out_dir}/website/${each.value}"
diff --git a/src/website b/src/website
index a3c94ee..601425d 160000
--- a/src/website
+++ b/src/website
@@ -1 +1 @@
-Subproject commit a3c94eef9f04724f604d89efde00dee14dcf07f0
+Subproject commit 601425d588eabd3bdf3eb360d9d2c01164c4a199