summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile17
-rw-r--r--site/404.gmi3
-rw-r--r--site/404.md5
-rw-r--r--site/index.gmi7
-rw-r--r--site/index.md9
-rw-r--r--site/s/index.gmi9
-rw-r--r--site/s/index.md7
-rw-r--r--site/u/index.md1
8 files changed, 22 insertions, 36 deletions
diff --git a/Makefile b/Makefile
index 5753b5f..97a1d52 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
GEMTEXT=$(shell find -L site -type f -name "*.gmi" -print)
-MARKDOWN=$(shell find -L site -type f -name "*.md" -print)
-HTML=$(MARKDOWN:%.md=%.html)
+HTML=$(GEMTEXT:%.gmi=%.html)
RSS=$(shell find -L . -type d -name "*.rss" -print)
RSS_XML=$(RSS:%.rss=%.xml)
@@ -9,15 +8,6 @@ RSS_XML=$(RSS:%.rss=%.xml)
all: $(HTML) $(RSS_XML)
-%.html: %.md header.html footer.html
- @echo "HTML $@"
- cp header.html $@
- markdown -f fencedcode $< | sed -e 's/\.md/\.html/g ; /^<h2>.*/i </div><div class="content">' >> $@
- echo "</div>" >> $@
- echo "<br>" >> $@
- lsand -H | tail -n +2 >> $@
- cat footer.html >> $@
-
%.xml: %.rss %.rss.header.xml %.rss.item_header.xml rss_item_footer.xml rss_footer.xml
@echo "RSS $@"
cat $<.header.xml > $@
@@ -34,11 +24,10 @@ all: $(HTML) $(RSS_XML)
%.html: %.gmi header.html footer.html gmi2html
@echo "GMI2HTML $@"
cp header.html $@
- ./gmi2html < $< > help.txt
- ./gmi2html < $< | sed -e 's/\.md/\.html/g ; /^<h2>.*/i </div><div class="content">' >> $@
+ ./gmi2html < $< | sed -e 's/\.gmi/\.html/g ; /^<h2>.*/i </div><div class="content">' >> $@
echo "</div>" >> $@
echo "<br />" >> $@
- lsand -H | tail -n +2 >> $@
+ #lsand -H | tail -n +2 >> $@
cat footer.html >> $@
gmi2html: gmi2html.c
diff --git a/site/404.gmi b/site/404.gmi
new file mode 100644
index 0000000..c430636
--- /dev/null
+++ b/site/404.gmi
@@ -0,0 +1,3 @@
+# Page not found
+While you're here, did you know that you can view any page on this site with Gemini? Just replace the "html" at the end of the URL with "gmi", and "https" with "gemini"! Awesome, right?
+
diff --git a/site/404.md b/site/404.md
deleted file mode 100644
index 474b207..0000000
--- a/site/404.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Page not found
-
-Sorry.
-
-While you're here though, did you know that you can view any page on this site in Markdown? Just replace the "html" at the end of the URL with "md"! Awesome, right?
diff --git a/site/index.gmi b/site/index.gmi
new file mode 100644
index 0000000..f963e8e
--- /dev/null
+++ b/site/index.gmi
@@ -0,0 +1,7 @@
+# League of Humanity
+=> en/index.gmi English
+
+## Misc
+=> s/index.gmi Stream
+=> u/index.gmi Userpages
+
diff --git a/site/index.md b/site/index.md
deleted file mode 100644
index 574d0e5..0000000
--- a/site/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# League of Humanity
-
-- [English](en/index.md)
-
-## Misc
-
-- [Stream](s/index.md)
-- [Userpages](u/index.md)
-
diff --git a/site/s/index.gmi b/site/s/index.gmi
new file mode 100644
index 0000000..de1a694
--- /dev/null
+++ b/site/s/index.gmi
@@ -0,0 +1,9 @@
+# Streams
+Live streams served hot and fresh from this server.
+
+=> stat/ View status
+=> rtmp://leagueh.xyz/stream/katp32 Katherine Peeters' stream
+
+## Video on demand
+=> /l/katherine.peeters/vod/ Katherine Peeters' VOD
+
diff --git a/site/s/index.md b/site/s/index.md
deleted file mode 100644
index dac39b3..0000000
--- a/site/s/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Streams
-
-Live streams served hot and fresh from this server. [View status.](stat/)
-
-- [Katherine Peeters](/u/katherine.peeters/index.md) - <rtmp://leagueh.xyz/stream/katp32>
- - Stream recordings: [VOD](/l/katherine.peeters/vod/)
-
diff --git a/site/u/index.md b/site/u/index.md
deleted file mode 100644
index 11e486d..0000000
--- a/site/u/index.md
+++ /dev/null
@@ -1 +0,0 @@
-- [Katherine Peeters](katherine.peeters/index.md)