Compare commits

..

No commits in common. "85e5a56bdc84de721dcc11990a984f0b2aa26c16" and "236526850439e135b822bfd3a8782a2c52ac64a1" have entirely different histories.

6 changed files with 18 additions and 24 deletions

View file

@ -6,11 +6,6 @@ on:
push: push:
branches: branches:
- main - main
paths:
- 'gemlog/**'
- 'static/**'
- 'templates/**'
- 'gempost.yaml'
concurrency: # prevent concurrent deploys doing strange things concurrency: # prevent concurrent deploys doing strange things
group: deploy-gemini-capsule group: deploy-gemini-capsule
@ -42,11 +37,12 @@ jobs:
oauth-client-id: ${{ secrets.TS_API_CLIENT_ID }} oauth-client-id: ${{ secrets.TS_API_CLIENT_ID }}
oauth-secret: ${{ secrets.TS_API_CLIENT_SECRET }} oauth-secret: ${{ secrets.TS_API_CLIENT_SECRET }}
tags: ${{ secrets.TS_TAG }} tags: ${{ secrets.TS_TAG }}
- name: Configure SSH known hosts - name: Install SSH key
run: | uses: shimataro/ssh-key-action@v2
mkdir -p ~/.ssh with:
echo "${{ secrets.SSH_KNOWN_HOSTS }}" > ~/.ssh/known_hosts key: ${{ secrets.SSH_KEY }}
chmod 644 ~/.ssh/known_hosts name: id_rsa
known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
- name: Deploy GMI to Agate - name: Deploy GMI to Agate
run: | run: |
rsync -avz --delete -e ssh public/ deploy@${{ secrets.GMI_HOST }}:${{ secrets.GMI_CONTENT_PATH }} rsync -avz --delete -e ssh public/ deploy@${{ secrets.GMI_HOST }}:${{ secrets.GMI_CONTENT_PATH }}

View file

@ -1,3 +1,4 @@
version: "3.9"
services: services:
agate: agate:
restart: always restart: always
@ -8,8 +9,4 @@ services:
- ./certs:/var/agate/certs - ./certs:/var/agate/certs
ports: ports:
- "1965:1965" - "1965:1965"
command: > command: --content content --certs certs --addr 0.0.0.0:1965 --hostname gmi.runtimeterror.dev --hostname capsule.jbowdre.lol --lang en-US
--content content --certs certs --addr 0.0.0.0:1965
--hostname gmi.runtimeterror.dev
--hostname capsule.jbowdre.lol
--lang en-US

View file

@ -52,4 +52,3 @@ author:
name: "John Bowdre" # Required name: "John Bowdre" # Required
email: "jbowdre@omg.lol" # Optional email: "jbowdre@omg.lol" # Optional
uri: "gemini://capsule.jbowdre.lol" # Optional uri: "gemini://capsule.jbowdre.lol" # Optional

View file

@ -8,3 +8,4 @@ services:
volumes: volumes:
- ./style.css:/app/style.css - ./style.css:/app/style.css
command: -s style.css gemini://capsule.jbowdre.lol command: -s style.css gemini://capsule.jbowdre.lol

View file

@ -114,3 +114,4 @@ input:focus {
border-color: #80bdff; border-color: #80bdff;
box-shadow: 0 0 0 0.2rem rgba(0,123,255,.25); box-shadow: 0 0 0 0.2rem rgba(0,123,255,.25);
} }

View file

@ -17,4 +17,4 @@
=> https://url.jbowdre.lol/signal signal => https://url.jbowdre.lol/signal signal
=> https://url.jbowdre.lol/xmpp xmpp => https://url.jbowdre.lol/xmpp xmpp
=> mailto:jbowdre@omg.lol 📧 email => mailto:jbowdre@omg.lol 📧 email
=> https://url.jbowdre.lol/pgp └─ pgp key => https://url.jbowdre.lol/pgp pgp key