From 5b76e96985c1eacd94d3e5876607aa4cbb6a9bd4 Mon Sep 17 00:00:00 2001
From: dongdigua <dongdigua@outlook.com>
Date: Tue, 27 Jun 2023 14:18:32 +0800
Subject: [PATCH] docker: fix cgi & sh location, README

---
 gmi/docker/Dockerfile     | 2 +-
 gmi/docker/README.gmi     | 7 +++----
 gmi/docker/cgi/stat.cgi   | 2 +-
 gmi/docker/genkey.sh      | 2 +-
 gmi/docker/run-wrapper.sh | 6 ++++--
 gmi/docker/update-git.sh  | 1 +
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gmi/docker/Dockerfile b/gmi/docker/Dockerfile
index ebff9e8..94c3c39 100644
--- a/gmi/docker/Dockerfile
+++ b/gmi/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN git clone https://github.com/dongdigua/dongdigua.github.io.git --depth 1 \
 
 COPY run-wrapper.sh .
 COPY gmid.conf /dongdigua.github.io/gmi/docker/
-COPY cgi/*     /dongdigua.github.io/gmi/docker/cgi/
+COPY cgi/*     /dongdigua.github.io/cgi/
 COPY update-git.sh /etc/periodic/hourly/
 
 # for testing purpose only
diff --git a/gmi/docker/README.gmi b/gmi/docker/README.gmi
index 0ed5284..3e8bcb5 100644
--- a/gmi/docker/README.gmi
+++ b/gmi/docker/README.gmi
@@ -5,12 +5,11 @@ alpine linux
 => https://weinan.io/2019/04/06/cron.html cron
 
 ## Server Program
-=> https://github.com/mbrubeck/agate agate
-
-alternatives:
 => https://gmid.omarpolo.com gmid
-=> https://tildegit.org/solene/vger vger
 
+## Hot Update
+* git pull
+* gmid.conf reload
 
 ## TODO
 CGI script:
diff --git a/gmi/docker/cgi/stat.cgi b/gmi/docker/cgi/stat.cgi
index 337b116..958d55d 100755
--- a/gmi/docker/cgi/stat.cgi
+++ b/gmi/docker/cgi/stat.cgi
@@ -1,4 +1,4 @@
-#! /usr/bin/sh
+#! /bin/sh
 
 printf "20 text/gemini\r\n";
 printf "OS: $(uname -rv)\r\nuptime: $(uptime)\r\nserver: $SERVER_SOFTWARE\r\nauth: $AUTH\r\n";
diff --git a/gmi/docker/genkey.sh b/gmi/docker/genkey.sh
index 2a58a70..accf371 100755
--- a/gmi/docker/genkey.sh
+++ b/gmi/docker/genkey.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/sh
+#! /bin/sh
 
 if test -f /etc/ssl/gmid.pem; then
     echo "OK certificate exists"
diff --git a/gmi/docker/run-wrapper.sh b/gmi/docker/run-wrapper.sh
index 350a657..3291989 100755
--- a/gmi/docker/run-wrapper.sh
+++ b/gmi/docker/run-wrapper.sh
@@ -1,10 +1,12 @@
 #! /bin/sh
 
-sh genkey.sh
+REPO=/dongdigua.github.io
+
+$REPO/gmi/docker/genkey.sh
 
 crond -f -d 8 &
 tail -f /var/log/git.log &
-gmid -f -c /dongdigua.github.io/gmi/docker/gmid.conf -Dgem_host=$GEMINI_HOST
+gmid -f -c $REPO/gmi/docker/gmid.conf -Dgem_host=$GEMINI_HOST
 
 wait -n
 echo $?
diff --git a/gmi/docker/update-git.sh b/gmi/docker/update-git.sh
index 4cfccff..29c2234 100755
--- a/gmi/docker/update-git.sh
+++ b/gmi/docker/update-git.sh
@@ -3,4 +3,5 @@
 cd /dongdigua.github.io
 git pull --rebase >> /var/log/git.log 2>&1
 python misc/mdlist2gmi.py > posts.gmi
+cp -r gmi/docker/cgi .
 pkill -HUP gmid