diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 16e22df..0000000 --- a/.drone.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -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 diff --git a/.env.sample b/.env.sample deleted file mode 100644 index 0f41533..0000000 --- a/.env.sample +++ /dev/null @@ -1,26 +0,0 @@ -TYPE=federatedwiki - -DOMAIN=federatedwiki.example.com -## Domain aliases -#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_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" -ADMIN_KEY="" - -FEDWIKI_IS_PRIVATE=0 diff --git a/.gitignore b/.gitignore index 37b52cc..4c49bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/.envrc +.env diff --git a/abra.sh b/abra.sh deleted file mode 100644 index 7ae0733..0000000 --- a/abra.sh +++ /dev/null @@ -1,23 +0,0 @@ -export INSTALL_SH_VERSION=v9 -export CONFIG_JSON_VERSION=v7 -export CONFIG_OWNER_JSON_VERSION=v4 - -abra_backup_app() { - _abra_backup_dir "app:/home/node/.wiki" -} - -abra_restore_app() { - # shellcheck disable=SC2034 - { - abra__src_="-" - abra__dst_="app:/home/node/.wiki" - } - - zcat "$@" | sub_app_cp - - success "Restored 'app'" -} - -abra_backup() { - abra_backup_app -} diff --git a/compose.lib.yml b/compose.lib.yaml similarity index 82% rename from compose.lib.yml rename to compose.lib.yaml index 5de1e75..e5a6ecb 100644 --- a/compose.lib.yml +++ b/compose.lib.yaml @@ -1,6 +1,3 @@ ---- -version: "3.8" - services: app: volumes: diff --git a/compose.owner.yml b/compose.owner.yaml similarity index 70% rename from compose.owner.yml rename to compose.owner.yaml index 678205a..10ee306 100644 --- a/compose.owner.yml +++ b/compose.owner.yaml @@ -1,7 +1,3 @@ - ---- -version: "3.8" - services: app: configs: @@ -10,6 +6,6 @@ services: configs: config_owner_json_conf: - name: ${STACK_NAME}_config_owner_json_${CONFIG_OWNER_JSON_VERSION} + name: ${STACK_NAME}_config_owner_json file: config.owner.json.tmpl template_driver: golang diff --git a/compose.wikicafe.yml b/compose.wikicafe.yaml similarity index 78% rename from compose.wikicafe.yml rename to compose.wikicafe.yaml index 7b267f5..301d72a 100644 --- a/compose.wikicafe.yml +++ b/compose.wikicafe.yaml @@ -1,6 +1,3 @@ ---- -version: "3.8" - services: app: image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest diff --git a/compose.yml b/compose.yaml similarity index 90% rename from compose.yml rename to compose.yaml index 5a0f3c5..689443a 100644 --- a/compose.yml +++ b/compose.yaml @@ -1,6 +1,3 @@ ---- -version: "3.8" - services: app: image: dobbs/farm:1.0.18 @@ -37,7 +34,6 @@ services: - "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 @@ -55,9 +51,9 @@ networks: configs: install_sh_conf: - name: ${STACK_NAME}_install_sh_${INSTALL_SH_VERSION} + name: ${STACK_NAME}_install_sh file: install.sh config_json_conf: - name: ${STACK_NAME}_config_json_${CONFIG_JSON_VERSION} + name: ${STACK_NAME}_config_json file: config.json.tmpl template_driver: golang diff --git a/release/1.0.0+1.0.18 b/release/1.0.0+1.0.18 deleted file mode 100644 index 1d777c6..0000000 --- a/release/1.0.0+1.0.18 +++ /dev/null @@ -1,7 +0,0 @@ -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