From 90e68df55b3b85e7e45271a18e7e5667712d431f Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 24 Feb 2023 00:33:06 +0100 Subject: [PATCH 1/9] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index d91ef61..61c811f 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From 297ae7281d783ff6069c3727b417178e908bc191 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 26 Feb 2023 21:29:27 +0100 Subject: [PATCH 2/9] update GTS website --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 8702271..891fde3 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "https://github.com/superseriousbusiness/gotosocial", "upstream": { "license": "AGPL-3.0-only", - "website": "https://docs.gotosocial.org/", + "website": "https://gotosocial.org/", "demo": "", "admindoc": "https://docs.gotosocial.org/en/latest/", "userdoc": "https://docs.gotosocial.org/en/latest/", @@ -114,4 +114,4 @@ } ] } -} +} \ No newline at end of file From ffce867c3466627aa0a30001ded998548d4faa7d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 26 Feb 2023 20:29:31 +0000 Subject: [PATCH 3/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9019322..743a37c 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ And to promote them as an administrator of your instance: ## Documentation and resources -* Official app website: +* Official app website: * Official user documentation: * Official admin documentation: * Upstream app code repository: diff --git a/README_fr.md b/README_fr.md index d9b40a7..e0c75a7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -113,7 +113,7 @@ Et pour promouvoir un compte en tant qu'administrateur de votre instance : ## Documentations et ressources -* Site officiel de l’app : +* Site officiel de l’app : * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : From fa051c736453e673914a45920a37567a95534316 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 26 Feb 2023 21:32:40 +0100 Subject: [PATCH 4/9] removal of a command that is no longer required --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index d75df3f..7b8bf25 100755 --- a/scripts/install +++ b/scripts/install @@ -276,8 +276,6 @@ ynh_script_progression --message="Creating gotosocial admin user..." --weight=1 "$final_path"/gotosocial --config-path "$final_path/config.yaml" admin account create --username "$admin" --email "$email" --password "$password" -"$final_path"/gotosocial --config-path "$final_path/config.yaml" admin account confirm --username "$admin" - "$final_path"/gotosocial --config-path "$final_path/config.yaml" admin account promote --username "$admin" #================================================= From b5062cbda0e9d0219fab472d72559d859e699033 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Apr 2023 17:39:16 +0000 Subject: [PATCH 5/9] Upgrade to v0.8.0 --- conf/arm64.src | 6 +++--- conf/armv6.src | 6 +++--- conf/armv7.src | 6 +++--- conf/i386.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/arm64.src b/conf/arm64.src index 5352ec0..b22b1a8 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.7.1/gotosocial_0.7.1_linux_arm64.tar.gz -SOURCE_SUM=6f60b13214e51da38336333dc780611729a66fc894d7093aef9c49c9a5e48bab +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_arm64.tar.gz +SOURCE_SUM=5dc2e205f8d254c4b17880d830efc34e135a3feade5347d8bfe8ad04912cf121 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.7.1_linux_arm64.tar.gz +SOURCE_FILENAME=gotosocial_0.8.0_linux_arm64.tar.gz diff --git a/conf/armv6.src b/conf/armv6.src index c7d5b71..cbe155c 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.7.1/gotosocial_0.7.1_linux_armv6.tar.gz -SOURCE_SUM=582a9b0cefb62039a737aa1fb0a08bd3d917d679db473d15042dcbcb6bc88cf4 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_armv6.tar.gz +SOURCE_SUM=9551e2d8f30db11a5b3c5539e4ed67f6ffd78d94afebb09c5ec98a91d7da4e3a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.7.1_linux_armv6.tar.gz +SOURCE_FILENAME=gotosocial_0.8.0_linux_armv6.tar.gz diff --git a/conf/armv7.src b/conf/armv7.src index 8b899cc..3cafb01 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.7.1/gotosocial_0.7.1_linux_armv7.tar.gz -SOURCE_SUM=a9cd301bffecf4d863419fc614be50f890e577960a1db529799f97cf1e8ee4b9 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_armv7.tar.gz +SOURCE_SUM=7598eabfaed6ec6de0f7846d80b913708a2f115aac6cbce3be5428d92a63a6e4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.7.1_linux_armv7.tar.gz +SOURCE_FILENAME=gotosocial_0.8.0_linux_armv7.tar.gz diff --git a/conf/i386.src b/conf/i386.src index 3cf2f7b..d78b7b5 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.7.1/gotosocial_0.7.1_linux_386.tar.gz -SOURCE_SUM=864ac0cf58623fe77b4f9de7e90d038ab589cf80026df3866b5a5fb0893cd24c +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_386.tar.gz +SOURCE_SUM=17ef690197873b23759d7d84c4801689637eba5093d24b8903fa46032d18b15b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.7.1_linux_386.tar.gz +SOURCE_FILENAME=gotosocial_0.8.0_linux_386.tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index b53064c..4cff682 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.7.1/gotosocial_0.7.1_linux_amd64.tar.gz -SOURCE_SUM=e19740b5cb6891d80440425d5c255089fef06b08b741dc5f115761c94a3910e7 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_amd64.tar.gz +SOURCE_SUM=7384267428167e8852223998995f83cad7670cd803688d562eda0d9c5d95ce5a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.7.1_linux_amd64.tar.gz +SOURCE_FILENAME=gotosocial_0.8.0_linux_amd64.tar.gz diff --git a/manifest.json b/manifest.json index 891fde3..d0f55fa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActivityPub social network server", "fr": "Serveur de réseau social basé sur ActivityPub" }, - "version": "0.7.1~ynh2", + "version": "0.8.0~ynh1", "url": "https://github.com/superseriousbusiness/gotosocial", "upstream": { "license": "AGPL-3.0-only", From f8721c52a9eea75109128e124913dfe06bafda36 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Apr 2023 17:39:21 +0000 Subject: [PATCH 6/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 743a37c..b6de2cb 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org). -**Shipped version:** 0.7.1~ynh2 +**Shipped version:** 0.8.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index e0c75a7..25dfbaa 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org). -**Version incluse :** 0.7.1~ynh2 +**Version incluse :** 0.8.0~ynh1 ## Captures d’écran From 82bb3cc4bd78631aa7a36dca83104ec71ef10dfb Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 9 Apr 2023 19:46:52 +0200 Subject: [PATCH 7/9] update congif.yaml according to the newer version --- conf/config.yaml | 144 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 107 insertions(+), 37 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index c4b3895..96d710c 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -55,6 +55,11 @@ host: "__DOMAIN__" # to "gts.example.org/.well-known/webfinger" so that GtS can handle them properly. # # You should also redirect requests at "example.org/.well-known/nodeinfo" in the same way. +# +# You should also redirect requests at "example.org/.well-known/host-meta" in the same way. This endpoint +# is used by a number of clients to discover the API endpoint to use when the host and account domain are +# different. +# # An empty string (ie., not set) means that the same value as 'host' will be used. # # DO NOT change this after your server has already run once, or you will break things! @@ -226,63 +231,95 @@ db-sqlite-cache-size: "8MiB" db-sqlite-busy-timeout: "5m" cache: + # Cache configuration options: + # + # max-size = maximum cached objects count + # ttl = cached object lifetime + # sweep-freq = frequency to look for stale cache objects + # (zero will disable cache sweeping) + + ############################# + #### VISIBILITY CACHES ###### + ############################# + # + # Configure Status and account + # visibility cache. + + visibility-max-size: 2000 + visibility-ttl: "30m" + visibility-sweep-freq: "1m" + gts: ########################### #### DATABASE CACHES ###### ########################### # - # Database cache configuration: - # - # Allows configuration of caches used - # when loading GTS models from the database. - # - # max-size = maximum cached objects count - # ttl = cached object lifetime - # sweep-freq = frequency to look for stale cache objects + # Configure GTS database + # model caches. - account-max-size: 100 - account-ttl: "5m" - account-sweep-freq: "10s" + account-max-size: 2000 + account-ttl: "30m" + account-sweep-freq: "1m" block-max-size: 100 - block-ttl: "5m" - block-sweep-freq: "10s" + block-ttl: "30m" + block-sweep-freq: "1m" - domain-block-max-size: 1000 + domain-block-max-size: 2000 domain-block-ttl: "24h" domain-block-sweep-freq: "1m" - emoji-max-size: 500 - emoji-ttl: "5m" - emoji-sweep-freq: "10s" + emoji-max-size: 2000 + emoji-ttl: "30m" + emoji-sweep-freq: "1m" emoji-category-max-size: 100 - emoji-category-ttl: "5m" - emoji-category-sweep-freq: "10s" + emoji-category-ttl: "30m" + emoji-category-sweep-freq: "1m" - mention-max-size: 500 - mention-ttl: "5m" - mention-sweep-freq: "10s" + follow-max-size: 2000 + follow-ttl: "30m" + follow-sweep-freq: "1m" - notification-max-size: 500 - notification-ttl: "5m" - notification-sweep-freq: "10s" + follow-request-max-size: 2000 + follow-request-ttl: "30m" + follow-request-sweep-freq: "1m" + + media-max-size: 1000 + media-ttl: "30m" + media-sweep-freq: "1m" + + mention-max-size: 2000 + mention-ttl: "30m" + mention-sweep-freq: "1m" + + notification-max-size: 1000 + notification-ttl: "30m" + notification-sweep-freq: "1m" report-max-size: 100 - report-ttl: "5m" - report-sweep-freq: "10s" + report-ttl: "30m" + report-sweep-freq: "1m" - status-max-size: 500 - status-ttl: "5m" - status-sweep-freq: "10s" + status-max-size: 2000 + status-ttl: "30m" + status-sweep-freq: "1m" - tombstone-max-size: 100 - tombstone-ttl: "5m" - tombstone-sweep-freq: "10s" + status-fave-max-size: 2000 + status-fave-ttl: "30m" + status-fave-sweep-freq: "1m" - user-max-size: 100 - user-ttl: "5m" - user-sweep-freq: "10s" + tombstone-max-size: 500 + tombstone-ttl: "30m" + tombstone-sweep-freq: "1m" + + user-max-size: 500 + user-ttl: "30m" + user-sweep-freq: "1m" + + webfinger-max-size": 250 + webfinger-ttl: "24h" + webfinger-sweep-freq": "1m" ###################### ##### WEB CONFIG ##### @@ -573,6 +610,22 @@ letsencrypt-cert-dir: "/gotosocial/storage/certs" # Default: "" letsencrypt-email-address: "" +############################## +##### MANUAL TLS CONFIG ##### +############################## + +# String. Path to a PEM-encoded file on disk that includes the certificate chain +# and the public key +# Examples: ["/gotosocial/storage/certs/chain.pem"] +# Default: "" +tls-certificate-chain: "" + +# String. Path to a PEM-encoded file on disk containing the private key for the +# associated tls-certificate-chain +# Examples: ["/gotosocial/storage/certs/private.pem"] +# Default: "" +tls-certificate-key: "" + ####################### ##### OIDC CONFIG ##### ####################### @@ -618,7 +671,7 @@ oidc-client-secret: "" # Array of string. Scopes to request from the OIDC provider. The returned values will be used to # populate users created in GtS as a result of the authentication flow. 'openid' and 'email' are required. # 'profile' is used to extract a username for the newly created user. -# 'groups' is optional and can be used to determine if a user is an admin (if they're in the group 'admin' or 'admins'). +# 'groups' is optional and can be used to determine if a user is an admin based on oidc-admin-groups. # Examples: See eg., https://auth0.com/docs/scopes/openid-connect-scopes # Default: ["openid", "email", "profile", "groups"] oidc-scopes: @@ -634,6 +687,11 @@ oidc-scopes: # Default: false oidc-link-existing: false +# Array of string. If the returned ID token contains a 'groups' claim that matches one of the +# groups in oidc-admin-groups, then this user will be granted admin rights on the GtS instance +# Default: [] +oidc-admin-groups: [] + ####################### ##### SMTP CONFIG ##### ####################### @@ -669,6 +727,18 @@ smtp-password: "" # Default: "" smtp-from: "GoToSocial@__DOMAIN__" +# Bool. If true, when an email is sent that has multiple recipients, each recipient +# will be included in the To field, so that each recipient can see who else got the +# email, and they can 'reply all' to the other recipients if they want to. +# +# If false, email will be sent to Undisclosed Recipients, and each recipient will not +# be able to see who else received the email. +# +# It might be useful to change this setting to 'true' if you want to be able to discuss +# new moderation reports with other admins by 'replying-all' to the notification email. +# Default: false +smtp-disclose-recipients: false + ######################### ##### SYSLOG CONFIG ##### ######################### From 3652f904eb8e36ef991ce41ad7676a0bca52782b Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 10 Apr 2023 17:38:12 +0200 Subject: [PATCH 8/9] finish deleting unnecessary command lines --- doc/DISCLAIMER.md | 2 -- doc/DISCLAIMER_fr.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index a6912b0..f13fb16 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -62,8 +62,6 @@ To create a new user, proceed as follows: ``` bash ./gotosocial --config-path config.yaml admin account create --username some_username --email someuser@example.org --password 'SomeLongAndComplicatedPassword' - -./gotosocial --config-path config.yaml admin account confirm --username some_username ``` And to promote them as an administrator of your instance: diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 6a32c79..5d1e78b 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -62,8 +62,6 @@ Pour créer un nouveau compte utilisateur, procédez comme suit : ``` bash ./gotosocial --config-path config.yaml admin account create --username nom_dutilisateur --email utilisateur@example.org --password 'UnMotDePasseTrèsComplexe' - -./gotosocial --config-path config.yaml admin account confirm --username nom_dutilisateur ``` Et pour promouvoir un compte en tant qu'administrateur de votre instance : From 907a80fe9c4b332e2c8b7c5f31cbe33504a91265 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 10 Apr 2023 15:38:21 +0000 Subject: [PATCH 9/9] Auto-update README --- README.md | 2 -- README_fr.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/README.md b/README.md index b6de2cb..2e19e78 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,6 @@ To create a new user, proceed as follows: ``` bash ./gotosocial --config-path config.yaml admin account create --username some_username --email someuser@example.org --password 'SomeLongAndComplicatedPassword' - -./gotosocial --config-path config.yaml admin account confirm --username some_username ``` And to promote them as an administrator of your instance: diff --git a/README_fr.md b/README_fr.md index 25dfbaa..ebe3479 100644 --- a/README_fr.md +++ b/README_fr.md @@ -97,8 +97,6 @@ Pour créer un nouveau compte utilisateur, procédez comme suit : ``` bash ./gotosocial --config-path config.yaml admin account create --username nom_dutilisateur --email utilisateur@example.org --password 'UnMotDePasseTrèsComplexe' - -./gotosocial --config-path config.yaml admin account confirm --username nom_dutilisateur ``` Et pour promouvoir un compte en tant qu'administrateur de votre instance :