diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | compose.yml | 6 | ||||
| -rw-r--r-- | gemini.Dockerfile (renamed from capsule.Dockerfile) | 4 | ||||
| -rw-r--r-- | gemini/.editorconfig (renamed from capsule/.editorconfig) | 0 | ||||
| -rw-r--r-- | gemini/.gitignore (renamed from capsule/.gitignore) | 0 | ||||
| -rw-r--r-- | gemini/Makefile (renamed from capsule/Makefile) | 0 | ||||
| -rwxr-xr-x | gemini/build_loglog.bash (renamed from capsule/build_loglog.bash) | 0 | ||||
| -rwxr-xr-x | gemini/build_longlog.bash (renamed from capsule/build_longlog.bash) | 0 | ||||
| -rwxr-xr-x | gemini/build_microlog.bash (renamed from capsule/build_microlog.bash) | 0 | ||||
| -rw-r--r-- | gemini/comitium-data/feeds.txt (renamed from capsule/comitium-data/feeds.txt) | 0 | ||||
| -rw-r--r-- | gemini/comitium-data/header.gmi (renamed from capsule/comitium-data/header.gmi) | 0 | ||||
| l--------- | gemini/content/feed.gmi (renamed from capsule/content/feed.gmi) | 0 | ||||
| l--------- | gemini/content/images (renamed from capsule/content/images) | 0 | ||||
| -rw-r--r-- | gemini/content/index.gmi (renamed from capsule/content/index.gmi) | 0 | ||||
| -rw-r--r-- | gemini/content/logs/index.gmi (renamed from capsule/content/logs/index.gmi) | 0 | ||||
| l--------- | gemini/content/logs/longlog (renamed from capsule/content/logs/longlog) | 0 | ||||
| l--------- | gemini/content/subscriptions.gmi (renamed from capsule/content/subscriptions.gmi) | 0 | ||||
| l--------- | gemini/microlog (renamed from capsule/microlog) | 0 | ||||
| -rwxr-xr-x | gemini/run.sh (renamed from capsule/run.sh) | 0 | ||||
| -rw-r--r-- | gemini/templates/loglog-header.gmi (renamed from capsule/templates/loglog-header.gmi) | 0 | ||||
| -rw-r--r-- | gemini/templates/longlog-header.gmi (renamed from capsule/templates/longlog-header.gmi) | 0 | ||||
| -rw-r--r-- | gemini/templates/microlog-header.gmi (renamed from capsule/templates/microlog-header.gmi) | 0 |
22 files changed, 6 insertions, 6 deletions
@@ -6,7 +6,7 @@ Structure: ``` / -├── capsule My Gemini capsule +├── gemini My Gemini capsule ├── smtp A local SMTP server └── http My Website ``` diff --git a/compose.yml b/compose.yml index 25c4928..6de4e61 100644 --- a/compose.yml +++ b/compose.yml @@ -1,9 +1,9 @@ services: - capsule: - image: git.joeac.net/joeac/joeac.net-capsule + gemini: + image: git.joeac.net/joeac/joeac.net-gemini build: context: . - dockerfile: capsule.Dockerfile + dockerfile: gemini.Dockerfile ports: - "1965:1965" diff --git a/capsule.Dockerfile b/gemini.Dockerfile index e959d35..7cd4cad 100644 --- a/capsule.Dockerfile +++ b/gemini.Dockerfile @@ -16,7 +16,7 @@ RUN wget -O - https://git.sr.ht/~nytpu/comitium/archive/v1.8.2.tar.gz | tar -xz FROM alpine:3.23 AS final RUN mkdir -p /var/app/content WORKDIR /var/app -COPY capsule/.certificates .certificates +COPY gemini/.certificates .certificates RUN crontab -l > crontab.tmp \ && echo "0 */6 * * * /usr/local/bin/comitium refresh --data /var/app/comitium-data" >> crontab.tmp \ && crontab crontab.tmp \ @@ -31,7 +31,7 @@ RUN rc-update add crond COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium -COPY capsule . +COPY gemini . COPY common /var/common RUN make diff --git a/capsule/.editorconfig b/gemini/.editorconfig index 22357a2..22357a2 100644 --- a/capsule/.editorconfig +++ b/gemini/.editorconfig diff --git a/capsule/.gitignore b/gemini/.gitignore index 398c8d1..398c8d1 100644 --- a/capsule/.gitignore +++ b/gemini/.gitignore diff --git a/capsule/Makefile b/gemini/Makefile index eee7273..eee7273 100644 --- a/capsule/Makefile +++ b/gemini/Makefile diff --git a/capsule/build_loglog.bash b/gemini/build_loglog.bash index 247da74..247da74 100755 --- a/capsule/build_loglog.bash +++ b/gemini/build_loglog.bash diff --git a/capsule/build_longlog.bash b/gemini/build_longlog.bash index d23acfa..d23acfa 100755 --- a/capsule/build_longlog.bash +++ b/gemini/build_longlog.bash diff --git a/capsule/build_microlog.bash b/gemini/build_microlog.bash index b3c37dc..b3c37dc 100755 --- a/capsule/build_microlog.bash +++ b/gemini/build_microlog.bash diff --git a/capsule/comitium-data/feeds.txt b/gemini/comitium-data/feeds.txt index 6b5fff2..6b5fff2 100644 --- a/capsule/comitium-data/feeds.txt +++ b/gemini/comitium-data/feeds.txt diff --git a/capsule/comitium-data/header.gmi b/gemini/comitium-data/header.gmi index b7609bb..b7609bb 100644 --- a/capsule/comitium-data/header.gmi +++ b/gemini/comitium-data/header.gmi diff --git a/capsule/content/feed.gmi b/gemini/content/feed.gmi index c05592d..c05592d 120000 --- a/capsule/content/feed.gmi +++ b/gemini/content/feed.gmi diff --git a/capsule/content/images b/gemini/content/images index ccc7a5b..ccc7a5b 120000 --- a/capsule/content/images +++ b/gemini/content/images diff --git a/capsule/content/index.gmi b/gemini/content/index.gmi index 88b7303..88b7303 100644 --- a/capsule/content/index.gmi +++ b/gemini/content/index.gmi diff --git a/capsule/content/logs/index.gmi b/gemini/content/logs/index.gmi index e9109a8..e9109a8 100644 --- a/capsule/content/logs/index.gmi +++ b/gemini/content/logs/index.gmi diff --git a/capsule/content/logs/longlog b/gemini/content/logs/longlog index f04f5e4..f04f5e4 120000 --- a/capsule/content/logs/longlog +++ b/gemini/content/logs/longlog diff --git a/capsule/content/subscriptions.gmi b/gemini/content/subscriptions.gmi index 0935ecb..0935ecb 120000 --- a/capsule/content/subscriptions.gmi +++ b/gemini/content/subscriptions.gmi diff --git a/capsule/microlog b/gemini/microlog index 5fcc383..5fcc383 120000 --- a/capsule/microlog +++ b/gemini/microlog diff --git a/capsule/run.sh b/gemini/run.sh index 7535975..7535975 100755 --- a/capsule/run.sh +++ b/gemini/run.sh diff --git a/capsule/templates/loglog-header.gmi b/gemini/templates/loglog-header.gmi index 59bf60a..59bf60a 100644 --- a/capsule/templates/loglog-header.gmi +++ b/gemini/templates/loglog-header.gmi diff --git a/capsule/templates/longlog-header.gmi b/gemini/templates/longlog-header.gmi index 6e82e48..6e82e48 100644 --- a/capsule/templates/longlog-header.gmi +++ b/gemini/templates/longlog-header.gmi diff --git a/capsule/templates/microlog-header.gmi b/gemini/templates/microlog-header.gmi index 761e61a..761e61a 100644 --- a/capsule/templates/microlog-header.gmi +++ b/gemini/templates/microlog-header.gmi |