From 1e1675e5d3eea28bb383a7cfc8188fd67586b7b5 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Mon, 4 Dec 2023 20:04:43 +0000 Subject: [PATCH] deploy: a2d5d474b38d0a34027cf0c3b0e66269212e1bc1 --- 404.html | 2 +- categories/index.html | 2 +- contributors/index.html | 2 +- docs/comparsion/index.html | 2 +- docs/comparsion/misskey/index.html | 2 +- docs/index.html | 2 +- docs/install/fresh/index.html | 2 +- docs/install/index.html | 2 +- docs/install/migrate/index.html | 17 ++++++++++++----- ...1c7928292a0086fe393f3ab63029f6ed857aff657.js | 3 ++- tags/index.html | 2 +- 11 files changed, 23 insertions(+), 15 deletions(-) rename index.min.de8caa98775bf6d6f5f58a3d4d43f6e791e3b0ca8e02d588a6615eea32456160c6d084cb107e5a200e28b949a0bb3cddd6b9d0a44ca477b0e7a0d2edd050befd.js => index.min.49c812e0e08da5cbac552a41ad85f1519acf845b4af1cb75eb787694e7d8dd14e0317b0edd17880685186121c7928292a0086fe393f3ab63029f6ed857aff657.js (97%) diff --git a/404.html b/404.html index 4004170..c5aae65 100644 --- a/404.html +++ b/404.html @@ -3,4 +3,4 @@

Page not found :(

The page you are looking for doesn't exist or has been moved.

- \ No newline at end of file + \ No newline at end of file diff --git a/categories/index.html b/categories/index.html index e4f1aa5..8206cca 100644 --- a/categories/index.html +++ b/categories/index.html @@ -3,4 +3,4 @@

Categories

- \ No newline at end of file + \ No newline at end of file diff --git a/contributors/index.html b/contributors/index.html index 41a2f2f..d53432e 100644 --- a/contributors/index.html +++ b/contributors/index.html @@ -3,4 +3,4 @@

Contributors

- \ No newline at end of file + \ No newline at end of file diff --git a/docs/comparsion/index.html b/docs/comparsion/index.html index c069dc7..aa1388a 100644 --- a/docs/comparsion/index.html +++ b/docs/comparsion/index.html @@ -7,4 +7,4 @@ Comparsion
- \ No newline at end of file + \ No newline at end of file diff --git a/docs/comparsion/misskey/index.html b/docs/comparsion/misskey/index.html index 92cc010..e0d9185 100644 --- a/docs/comparsion/misskey/index.html +++ b/docs/comparsion/misskey/index.html @@ -30,4 +30,4 @@ been removed (smaller installation, faster image/video uploads)
  • argon2 instead of bcrypt for hashing users’ secrets
  • admins can delete remote emojis
  • admins can disable achievements
  • admins can refresh remote user details
  • admins can set a default emoji for likes/reactions
  • the PWA icon matches the instance icon
  • deleted custom emoji are automatically removed from Drive
    • ← Migrating from another software
    - \ No newline at end of file + \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index f307959..3042336 100644 --- a/docs/index.html +++ b/docs/index.html @@ -7,4 +7,4 @@ Comparsion
    - \ No newline at end of file + \ No newline at end of file diff --git a/docs/install/fresh/index.html b/docs/install/fresh/index.html index bf9a43f..aac299a 100644 --- a/docs/install/fresh/index.html +++ b/docs/install/fresh/index.html @@ -124,4 +124,4 @@ previous build, then you can install+build+migrate+restart again.

    Migrating from another software →
    - \ No newline at end of file + \ No newline at end of file diff --git a/docs/install/index.html b/docs/install/index.html index ff4c198..9237248 100644 --- a/docs/install/index.html +++ b/docs/install/index.html @@ -7,4 +7,4 @@ Comparsion
    - \ No newline at end of file + \ No newline at end of file diff --git a/docs/install/migrate/index.html b/docs/install/migrate/index.html index 9b01bb7..e088f96 100644 --- a/docs/install/migrate/index.html +++ b/docs/install/migrate/index.html @@ -12,9 +12,9 @@ Install

    • Migrating from another software

    Migrating from another software

    From Misskey

    Let’s say you have a working Misskey, running as user misskey from +ExpandCollapse

    On this page

    From Misskey

    Let’s say you have a working Misskey, running as user misskey from /home/misskey/misskey.

    Migrating to Sharkey is the same as updating to a newer Misskey version:

    sudo -u misskey -i
 cd misskey
@@ -33,7 +33,14 @@
 pnpm run build
 pnpm run migrate

    Also, clear your browser’s cache and local storage (this will log your -browser out of Misskey/Sharkey).

    From Firefish

    This guide was only tested on a Firefish 1.0.5-RC instance: other +browser out of Misskey/Sharkey).

    Using Docker

    If you are using the docker-compose.yml file from Misskey with which builds locally follow these steps:

    git remote rename origin misskey
+git remote add origin https://github.com/transfem-org/Sharkey.git
+git remote update -p
+git checkout -b stable --track origin/stable
+git pull --recurse-submodules
+pnpm install --frozen-lockfile
+sudo docker compose build
+

    From Firefish

    This guide was only tested on a Firefish 1.0.5-RC instance: other versions and instances may differ quite a lot from the one we used, esspecially if you have custom patches applied.

    If any of the steps fails, especially SQL queries, seek help from us via Matrix or @@ -41,7 +48,7 @@ in the DB yourself unless you really know what you are doing.

    Before you begin, please take a backup of your database. While you’re there, make sure you know how to restore from that backup! Using the plain format for pg_dump is probably the simplest way.

    It’s a good idea to have a separate backup of your list of silenced -instances and of your user table.

    Using Docker

    Stop / shut down the entire stack: PostgreSQL, Redis / KeyDB / +instances and of your user table.

    Using Docker

    Stop / shut down the entire stack: PostgreSQL, Redis / KeyDB / DragonflyDB, Sonic / ElasticSearch / MeiliSearch, Firefish itself. Stop all of it.

    Edit you docker compose and replace the Firefish image with ghcr.io/transfem-org/sharkey:stable

    If you use Sonic or ElasticSearch replace that section of the Docker @@ -179,4 +186,4 @@ be able to search notes, you must enable it via the “roles” system.

    Congratulations, you’re now running Sharkey!

    ← Fresh Installation
    Sharkey vs Misskey →
    - \ No newline at end of file + \ No newline at end of file diff --git a/index.min.de8caa98775bf6d6f5f58a3d4d43f6e791e3b0ca8e02d588a6615eea32456160c6d084cb107e5a200e28b949a0bb3cddd6b9d0a44ca477b0e7a0d2edd050befd.js b/index.min.49c812e0e08da5cbac552a41ad85f1519acf845b4af1cb75eb787694e7d8dd14e0317b0edd17880685186121c7928292a0086fe393f3ab63029f6ed857aff657.js similarity index 97% rename from index.min.de8caa98775bf6d6f5f58a3d4d43f6e791e3b0ca8e02d588a6615eea32456160c6d084cb107e5a200e28b949a0bb3cddd6b9d0a44ca477b0e7a0d2edd050befd.js rename to index.min.49c812e0e08da5cbac552a41ad85f1519acf845b4af1cb75eb787694e7d8dd14e0317b0edd17880685186121c7928292a0086fe393f3ab63029f6ed857aff657.js index ea205e2..7e87d61 100644 --- a/index.min.de8caa98775bf6d6f5f58a3d4d43f6e791e3b0ca8e02d588a6615eea32456160c6d084cb107e5a200e28b949a0bb3cddd6b9d0a44ca477b0e7a0d2edd050befd.js +++ b/index.min.49c812e0e08da5cbac552a41ad85f1519acf845b4af1cb75eb787694e7d8dd14e0317b0edd17880685186121c7928292a0086fe393f3ab63029f6ed857aff657.js @@ -43,7 +43,8 @@ Migrating to Sharkey is the same as updating to a newer Misskey version: sudo -u misskey -i cd misskey git remote rename origin misskey git remote add origin https://github.com/transfem-org/Sharkey.git git remote update -p git checkout -b stable --track origin/stable git pull --recurse-submodules pnpm install --frozen-lockfile pnpm run build pnpm run migrate Then you can restart your service. If you see weirdness like service not starting, or missing labels in the web UI, you should first make sure the build worked (check all the error messages!), then try building again from scratch: pnpm run clean-all pnpm install --frozen-lockfile pnpm run build pnpm run migrate Also, clear your browser\u0026rsquo;s cache and local storage (this will log your browser out of Misskey/Sharkey). -From Firefish # This guide was only tested on a Firefish 1.0.5-RC instance: other versions and instances may differ quite a lot from the one we used, esspecially if you have custom patches applied. +Using Docker # If you are using the docker-compose.yml file from Misskey with which builds locally follow these steps: +git remote rename origin misskey git remote add origin https://github.com/transfem-org/Sharkey.git git remote update -p git checkout -b stable --track origin/stable git pull --recurse-submodules pnpm install --frozen-lockfile sudo docker compose build From Firefish # This guide was only tested on a Firefish 1.0.5-RC instance: other versions and instances may differ quite a lot from the one we used, esspecially if you have custom patches applied. If any of the steps fails, especially SQL queries, seek help from us via Matrix or Discord. Do not try fixing things in the DB yourself unless you really know what you are doing. Before you begin, please take a backup of your database. While you\u0026rsquo;re there, make sure you know how to restore from that backup! Using the plain format for pg_dump is probably the simplest way. It\u0026rsquo;s a good idea to have a separate backup of your list of silenced instances and of your user table. diff --git a/tags/index.html b/tags/index.html index 76d92a6..fc5d0c8 100644 --- a/tags/index.html +++ b/tags/index.html @@ -3,4 +3,4 @@

    Tags

    - \ No newline at end of file + \ No newline at end of file