Compare commits

...

34 Commits

Author SHA1 Message Date
3wc
e90183f153 chore: publish 1.0.1+1.0.18 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-22 19:15:13 +02:00
3wc
03cdb435dd Remove HTTP
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-22 19:14:04 +02:00
3wc
33a740929d chore: publish 1.0.0+1.0.18 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-22 18:50:50 +02:00
3wc
98ef8f18d3 Add configurable bind-mount option
Some checks failed
continuous-integration/drone/push Build is failing
2023-08-22 18:48:13 +02:00
3wc
b28d08551e chore: publish 0.2.10+1.0.18 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-22 18:04:25 +02:00
3wc
7e15af4875 Further Caddy tweaking
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-20 16:29:53 +02:00
3wc
b0a737d69e Attempt to appease caddy
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-20 00:43:38 +02:00
3wc
45d76b05f6 Fix caddy label
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-20 00:38:20 +02:00
3wc
6804752d3b Hard-code CADDYFILE
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-20 00:21:54 +02:00
3wc
fc95658dba Add Caddy labels
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-20 00:16:41 +02:00
a1cdd385b4 chore: publish 0.2.9+1.0.17 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-21 18:18:42 -04:00
5ecc26589b chore: publish 0.2.8+1.0.17 release 2023-06-21 18:09:06 -04:00
c58712f63f chore: publish 0.2.7+1.0.17 release 2023-06-21 18:07:34 -04:00
9ba3d0bc3f chore: publish 0.2.6+1.0.17 release 2023-06-21 18:06:21 -04:00
6e8c37c2a6 chore: publish 0.2.5+1.0.17 release 2023-06-21 17:51:42 -04:00
c60645a61d chore: publish 0.2.4+1.0.17 release 2023-06-21 17:51:12 -04:00
cfee2399cf chore: publish 0.2.3+1.0.17 release 2023-06-21 17:41:58 -04:00
f19a20f880 chore: publish 0.2.2+1.0.17 release 2023-06-21 17:31:55 -04:00
3wc
0633d72d7d chore: publish 0.2.1+1.0.16 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-06-20 18:22:40 +01:00
3wc
0e24c78541 chore: publish 0.2.0+1.0.13 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-06-20 18:22:09 +01:00
3wc
32559a5aea Make custom wikicafe image optional, non-default 2023-06-20 18:21:43 +01:00
3wc
efebc41519 Switch to self-hosted stack-ssh-deploy image [mass update]
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-21 11:49:55 -08:00
3wc
0a21e11116 Add drone configs / secrets [mass update]
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-20 21:32:06 -08:00
3wc
8454597fca Add CI and catalogue generation [mass update]
Some checks failed
continuous-integration/drone/push Build is failing
2023-01-20 10:45:03 -08:00
3wc
caa7b8a02e Update abra syntax in examples (finally) [mass update] 2023-01-19 16:02:27 -08:00
3wc
3b6879415f Add optional compose file for lib persistence 2022-12-29 11:56:42 -08:00
3wc
777cb6263e Fix image path 2022-12-07 19:30:47 -08:00
3wc
23c2238460 Switch to our forked image 2022-12-07 19:21:59 -08:00
3wc
07e57c5022 Add backupbot config 2022-10-18 17:28:22 -04:00
3wc
139f829935 chore: publish 0.1.0+1.0.13 release 2022-09-27 14:36:18 -04:00
3wc
111feee4be Reduce priority of wiki routing rules 2022-09-27 14:15:44 -04:00
3wc
3191cf861f Switch back to Eric's (newer) Fedwiki image 2022-09-27 14:04:59 -04:00
3wc
4e1f67418a Goodbye, emojis! 😢
[ci skip]
2021-11-23 12:19:04 +02:00
3wc
a5c1567138 Use own docker image temporarily 2021-10-23 15:27:48 +02:00
9 changed files with 91 additions and 9 deletions

41
.drone.yml Normal file
View File

@ -0,0 +1,41 @@
---
kind: pipeline
name: deploy to swarm-test.autonomic.zone
steps:
- name: deployment
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
settings:
host: swarm-test.autonomic.zone
stack: federatedwiki
generate_secrets: true
purge: true
deploy_key:
from_secret: drone_ssh_swarm_test
networks:
- proxy
environment:
DOMAIN: federatedwiki.swarm-test.autonomic.zone
STACK_NAME: federatedwiki
LETS_ENCRYPT_ENV: production
INSTALL_SH_VERSION: v1
CONFIG_JSON_VERSION: v1
CONFIG_OWNER_JSON_VERSION: v1
trigger:
branch:
- main
---
kind: pipeline
name: generate recipe catalogue
steps:
- name: release a new version
image: plugins/downstream
settings:
server: https://build.coopcloud.tech
token:
from_secret: drone_abra-bot_token
fork: true
repositories:
- coop-cloud/auto-recipes-catalogue-json
trigger:
event: tag

View File

@ -5,8 +5,19 @@ DOMAIN=federatedwiki.example.com
#EXTRA_DOMAINS=', `www.federatedwiki.example.com`'
LETS_ENCRYPT_ENV=production
COMPOSE_FILE="compose.yml"
# Change to an absolute path to use a bind-mount, e.g. /opt/fedwiki
FEDWIKI_VOLUME="fedwiki"
# custom wiki.cafe image, for working oauth2 support
#COMPOSE_FILE="$COMPOSE_FILE:compose.wikicafe.yml"
# Predefined "owner" security
#COMPOSE_FILE="compose.yml:compose.owner.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.owner.yml"
# persistent lib volume / node_modules directory, e.g. for plugmatic
#COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml"
COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh"
AUTHOR="Baja Colorado"

View File

@ -4,8 +4,8 @@ Share pages circulating within a creative commons
<!-- metadata -->
* **Category**: Apps
* **Status**: ❹💣
* **Image**: [`dobbs/farm`](https://hub.docker.com/r/dobbs/farm/), ❶💚, upstream
* **Status**: 0, work-in-progress
* **Image**: [`dobbs/farm`](https://hub.docker.com/r/dobbs/farm/), 4, upstream
* **Healthcheck**: No
* **Backups**: No
* **Email**: No
@ -18,9 +18,9 @@ Share pages circulating within a creative commons
1. Set up Docker Swarm and [`abra`]
2. Deploy [`coop-cloud/traefik`]
3. `abra app new federatedwiki`
4. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to
4. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to
your Docker swarm box
5. `abra app YOURAPPDOMAIN deploy`
5. `abra app deploy YOURAPPDOMAIN`
[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik

View File

@ -1,4 +1,4 @@
export INSTALL_SH_VERSION=v8
export INSTALL_SH_VERSION=v9
export CONFIG_JSON_VERSION=v7
export CONFIG_OWNER_JSON_VERSION=v4

10
compose.lib.yml Normal file
View File

@ -0,0 +1,10 @@
---
version: "3.8"
services:
app:
volumes:
- "fedwiki_lib:/home/node/lib"
volumes:
fedwiki_lib:

6
compose.wikicafe.yml Normal file
View File

@ -0,0 +1,6 @@
---
version: "3.8"
services:
app:
image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest

View File

@ -3,11 +3,11 @@ version: "3.8"
services:
app:
image: dobbs/farm
image: dobbs/farm:1.0.18
command: /bin/sh config/install.sh
volumes:
- "fedwiki_friends:/home/node/config"
- "fedwiki:/home/node/.wiki"
- "${FEDWIKI_VOLUME}:/home/node/.wiki"
networks:
- proxy
configs:
@ -31,6 +31,13 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
- "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
- "traefik.http.routers.${STACK_NAME}.priority=1"
- "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}"
- "caddy.reverse_proxy={{upstreams 3000}}"
- "caddy.tls.on_demand="
- "backupbot.backup=true"
- "backupbot.backup.path=/home/node/.wiki"
- "coop-cloud.${STACK_NAME}.version=1.0.1+1.0.18"
# healthcheck:
# test: ["CMD", "curl", "-f", "http://localhost"]
# interval: 30s

View File

@ -8,4 +8,4 @@ if [ ! -f .wiki/config.owner.json ]; then
cp config/config.owner.json .wiki/config.owner.json
fi
wiki --farm --security_type=friends
wiki --farm

7
release/1.0.0+1.0.18 Normal file
View File

@ -0,0 +1,7 @@
WARNING! 🚨
There is a new mandatory config option, FEDWIKI_VOLUME -- please copy the
default value from the recipe .env.sample to your .env file on upgrade.
If you haven't done that yet, best to bail with Ctrl+C, then add the option,
then re-run this `abra app upgrade ...` command