From 1f26e5d22fa162070c3b83f36727ce316a5bca16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Tue, 14 Nov 2023 16:03:21 +0100
Subject: [PATCH] feat: resert domain to `https://sabre.io`, add CNAME file and
 remove old deployment stuff

---
 Makefile                         | 30 +++---------------------------
 app/config/sculpin_site_prod.yml |  3 ---
 setup_deploy.sh                  | 13 -------------
 source/CNAME                     |  1 +
 source/_layouts/default.html     |  2 +-
 5 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 app/config/sculpin_site_prod.yml
 delete mode 100755 setup_deploy.sh
 create mode 100644 source/CNAME

diff --git a/Makefile b/Makefile
index 92605412..1d321c8b 100644
--- a/Makefile
+++ b/Makefile
@@ -9,29 +9,12 @@ URL = https://${DOMAIN}
 
 SOURCE_MD_FILES = $(shell find source/ -type f -name "*.md" -or -name "*.html")
 
-.PHONY: all, generate, do-deploy, server, output_dev, output_prod, output_gh
+.PHONY: all, server, output_dev, output_gh
 
-all: do-deploy
+all: output_dev, output_gh
 
-generate: composer.lock output_prod
 gh-pages: composer.lock output_gh
 
-do-deploy: generate
-	cd deploy && \
-	echo "Fetching latest changes" && \
-	git checkout master && \
-	git pull && \
-	echo "Copying over the latest website version" && \
-	rm -r * && \
-	cp -r ../output_prod/* . && \
-	touch .nojekkyl && \
-	echo $(DOMAIN) > CNAME && \
-	git add -A && \
-	git commit -m "Automatic deployment `date -u`" && \
-	echo "Pushing changes" && \
-	git push origin master && \
-	echo "Deploy complete"
-
 server:
 	vendor/bin/sculpin generate --watch --server
 
@@ -43,8 +26,6 @@ vendor/autoload.php:
 
 output_dev: output_dev/atom.xml
 
-output_prod: output_prod/atom.xml
-
 output_gh: output_gh/atom.xml
 
 output_dev/atom.xml: source/css/sabre.css $(SOURCE_MD_FILES)
@@ -52,15 +33,10 @@ output_dev/atom.xml: source/css/sabre.css $(SOURCE_MD_FILES)
 	# as the main target to figure out if the source changed at all.
 	vendor/bin/sculpin generate --env=dev --url=$(URL)
 
-output_prod/atom.xml: source/css/sabre.css $(SOURCE_MD_FILES)
-	# atom.xml always changes to the latest date and time, so we can use this
-	# as the main target to figure out if the source changed at all.
-	vendor/bin/sculpin generate --env=prod --url=$(URL)
-
 output_gh/atom.xml: source/css/sabre.css $(SOURCE_MD_FILES)
 	# atom.xml always changes to the latest date and time, so we can use this
 	# as the main target to figure out if the source changed at all.
-	vendor/bin/sculpin generate --env=gh --url=https://sabre-io.github.io/sabre.io
+	vendor/bin/sculpin generate --env=gh --url=$(URL)
 
 
 YUI = $(shell which yuicompressor || which yui-compressor)
diff --git a/app/config/sculpin_site_prod.yml b/app/config/sculpin_site_prod.yml
deleted file mode 100644
index 7b2a3d13..00000000
--- a/app/config/sculpin_site_prod.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-imports:
-- sculpin_site.yml
-google_analytics_tracking_id: UA-2848664-5
diff --git a/setup_deploy.sh b/setup_deploy.sh
deleted file mode 100755
index c6a0176d..00000000
--- a/setup_deploy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-if [ $# -eq 0 ]; then
-    echo "Usage: $0 [github remote url] [branch]"
-    exit
-fi
-
-mkdir deploy/
-cd deploy/
-
-git init
-git remote add origin "$1"
-git pull
-git checkout "$2"
diff --git a/source/CNAME b/source/CNAME
new file mode 100644
index 00000000..3df67c9a
--- /dev/null
+++ b/source/CNAME
@@ -0,0 +1 @@
+sabre.io
diff --git a/source/_layouts/default.html b/source/_layouts/default.html
index 8dee38e4..6f253025 100644
--- a/source/_layouts/default.html
+++ b/source/_layouts/default.html
@@ -49,7 +49,7 @@
     {% endif %}
 
     {% block mainwrapper %}
-    <main{% if page.sidebar != "none" %} class="incl-sidebar"{% endif %}>
+    <main {% if page.sidebar != "none" %} class="incl-sidebar"{% endif %}>
         {% if page.sidebar != "none" %}
             {% include "sidebar.html" %}
         {% endif %}