From 487a5856f1f5715fcd7a9ecd1ab9bc4db4ed90cc Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 13 Oct 2023 06:58:12 +0200 Subject: [PATCH 01/11] small refactor --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4452969..76f3cfc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ pkg_dependencies="postgresql postgresql-contrib" # ($YNH_ARCH returns armhf for both...) detect_arch(){ local architecture - if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then + if [ -n "$(uname -m | grep [arm64,aarch64]; then architecture="arm64" elif [ -n "$(uname -m | grep 64)" ]; then architecture="x86-64" From 97f52c959ee8c8902535f245fbc6f32822f38b44 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 13 Oct 2023 04:58:19 +0000 Subject: [PATCH 02/11] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 9bc5506..b26314b 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,6 @@ And to promote them as an administrator of your instance: * Official user documentation: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index c26fcd4..b5659ca 100644 --- a/README_fr.md +++ b/README_fr.md @@ -115,7 +115,6 @@ Et pour promouvoir un compte en tant qu'administrateur de votre instance : * Documentation officielle utilisateur : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 66e58a558392227b437ddb64f2ccd56d69b777bc Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 17 Oct 2023 17:11:26 +0200 Subject: [PATCH 03/11] preparing for v0.12.0 --- conf/config.yaml | 99 +++++++++++++++++++++++++++++++++++++++++------- scripts/install | 2 + scripts/restore | 1 + scripts/upgrade | 10 +++++ 4 files changed, 99 insertions(+), 13 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index 5cbc7b0..a86aa1e 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -35,6 +35,17 @@ log-db-queries: false # Default: true log-client-ip: true +# String. Format to use for the timestamp in log lines. +# If set to the empty string, the timestamp will be +# ommitted from the logs entirely. +# +# The format must be compatible with Go's time.Layout, as +# documented on https://pkg.go.dev/time#pkg-constants. +# +# Examples: [true, false] +# Default: "02/01/2006 15:04:05.000" +log-timestamp-format: "02/01/2006 15:04:05.000" + # String. Application name to use internally. # Examples: ["My Application","gotosocial"] # Default: "gotosocial" @@ -72,7 +83,7 @@ host: "__DOMAIN__" # Examples: ["example.org","server.com"] # # Please read the appropriate section of the installation guide before you go messing around with this setting: -# https://docs.gotosocial.org/installation_guide/advanced/#can-i-host-my-instance-at-fediexampleorg-but-have-just-exampleorg-in-my-username +# https://docs.gotosocial.org/en/latest/advanced/host-account-domain/ # # Default: "" account-domain: "" @@ -262,6 +273,21 @@ web-asset-base-dir: "./web/assets/" # Config pertaining to instance federation settings, pages to hide/expose, etc. +# String. Federation mode to use for this instance. +# +# "blocklist" -- open federation by default. Only instances that are explicitly +# blocked will be denied (unless they are also explicitly allowed). +# +# "allowlist" -- closed federation by default. Only instances that are explicitly +# allowed will be able to interact with this instance. +# +# For more details on blocklist and allowlist modes, check the documentation at: +# https://docs.gotosocial.org/en/latest/admin/federation_modes +# +# Options: ["blocklist", "allowlist"] +# Default: "blocklist" +instance-federation-mode: "__INSTANCE_FEDERATION_MODE__" + # Bool. Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=open in order # to see a list of instances that this instance 'peers' with. Even if set to 'false', then authenticated # users (members of the instance) will still be able to query the endpoint. @@ -270,9 +296,12 @@ web-asset-base-dir: "./web/assets/" instance-expose-peers: __INSTANCE_EXPOSE_PEERS__ # Bool. Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=suspended in order -# to see a list of instances that this instance blocks/suspends. This will also allow unauthenticated -# users to see the list through the web UI. Even if set to 'false', then authenticated users (members -# of the instance) will still be able to query the endpoint. +# to see a list of instances that this instance blocks/suspends. Even if set to 'false', then authenticated +# users (members of the instance) will still be able to query the endpoint. +# +# WARNING: Setting this variable to 'true' may result in your instance being scraped by blocklist scrapers. +# See: https://docs.gotosocial.org/en/latest/admin/domain_blocks/#block-announce-bots +# # Options: [true, false] # Default: false instance-expose-suspended: __INSTANCE_EXPOSE_SUSPENDED__ @@ -714,21 +743,19 @@ request-id-header: "X-Request-Id" # Default: false tracing-enabled: false -# String. Set the transport protocol for the tracing system. Can either be "grpc" for -# OTLP gRPC or "jaeger" for jaeger based ingesters. -# Options: ["grpc", "jaeger"] +# String. Set the transport protocol for the tracing system. Can either be "grpc" +# for OTLP gRPC, or "http" for OTLP HTTP. +# Options: ["grpc", "http"] # Default: "grpc" tracing-transport: "grpc" -# String. Endpoint of the trace ingester. When using the gRPC based transport, the -# endpoint is usually a single address/port combination. For the jaeger transport it -# should be a fully qualified URL. -# OTLP gRPC or "jaeger" for jaeger based ingesters -# Examples: ["localhost:4317", "http://localhost:14268/api/traces"] +# String. Endpoint of the trace ingester. When using the gRPC or HTTP based transports, +# provide the endpoint as a single address/port combination without a protocol scheme. +# Examples: ["localhost:4317"] # Default: "" tracing-endpoint: "" -# Bool. Disable HTTPS for the gRPC transport protocol. +# Bool. Disable TLS for the gRPC and HTTP transport protocols. # Default: false tracing-insecure-transport: false @@ -838,6 +865,34 @@ advanced-cookies-samesite: "__ADVANCED_COOKIES_SAMESITE__" # Default: 1000 advanced-rate-limit-requests: __ADVANCED_RATE_LIMIT_REQUESTS__ +# Array of string. CIDRs to except from rate limit restrictions. +# Any IPs inside the CIDR range(s) will not have rate limiting +# applied on their requests, and rate limit headers will not be +# set for those requests. +# +# This can be useful in the following example cases (and probably +# a bunch of others as well): +# +# 1. You've set up an automated service that uses the API, and +# it keeps getting rate limited, even though you trust it's +# not abusing the instance. +# +# 2. You live with multiple people who use the same instance, +# and you're all using the same router/NAT, so you all have +# the same IP address, and you keep rate limiting each other. +# +# 3. You mostly use your own home internet to access your instance, +# and you want to exempt your home internet from rate limiting. +# +# You should be careful when adjusting this setting, since you +# might inadvertently make rate limiting useless if you set too +# wide a range. If in doubt, be too restrictive rather than too +# lenient, and adjust as you go. +# +# Example: ["192.168.0.0/16"] +# Default: [] +advanced-rate-limit-exceptions: [] + # Int. Amount of open requests to permit per CPU, per router grouping, before applying http # request throttling. Any requests beyond the calculated limit are held in a backlog queue for # up to 30 seconds before either being processed or timing out. Requests that don't fit in the backlog @@ -905,6 +960,24 @@ advanced-throttling-retry-after: "30s" # 4 cpu = 1 concurrent sender advanced-sender-multiplier: 2 +# Array of string. Extra URIs to add to 'img-src' and 'media-src' +# when building the Content-Security-Policy header for your instance. +# +# This can be used to allow the browser to load resources from additional +# sources like S3 buckets and so on when viewing your instance's pages +# and profiles in the browser. +# +# Since non-proxying S3 storage will be probed on instance launch to +# generate a correct Content-Security-Policy, you probably won't need +# to ever touch this setting, but it's included in the 'spirit of more +# configurable (usually) means more good'. +# +# See: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP +# +# Example: ["s3.example.org", "some-bucket-name.s3.example.org"] +# Default: [] +advanced-csp-extra-uris: [] + # Array of string. Extra URIs to add to 'img-src' and 'media-src' # when building the Content-Security-Policy header for your instance. # diff --git a/scripts/install b/scripts/install index 082d69a..ba267d9 100755 --- a/scripts/install +++ b/scripts/install @@ -47,6 +47,7 @@ accounts_reason_required=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_REASON_REQUIRED") accounts_allow_custom_css="false" accounts_custom_css_length="10000" +instance_federation_mode="blocklist" instance_expose_peers="false" instance_expose_suspended="false" instance_expose_suspended_web="false" @@ -122,6 +123,7 @@ ynh_app_setting_set --app="$app" --key=accounts_reason_required --value="$accoun ynh_app_setting_set --app="$app" --key=accounts_allow_custom_css --value="$accounts_allow_custom_css" ynh_app_setting_set --app="$app" --key=accounts_custom_css_length --value="$accounts_custom_css_length" +ynh_app_setting_set --app="$app" --key=instance_federation_mode --value="$instance_federation_mode" ynh_app_setting_set --app="$app" --key=instance_expose_peers --value="$instance_expose_peers" ynh_app_setting_set --app="$app" --key=instance_expose_suspended --value="$instance_expose_suspended" ynh_app_setting_set --app="$app" --key=instance_expose_suspended_web --value="$instance_expose_suspended_web" diff --git a/scripts/restore b/scripts/restore index 9247bf9..f14ca9d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -46,6 +46,7 @@ datadir=$(ynh_app_setting_get --app="$app" --key=datadir) cache_memory_target=$(ynh_app_setting_get --app="$app" --key=cache_memory_target) +instance_federation_mode=$(ynh_app_setting_get --app="$app" --key=instance_federation_mode) instance_expose_peers=$(ynh_app_setting_get --app="$app" --key=instance_expose_peers) instance_expose_suspended=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended) instance_expose_suspended_web=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended_web) diff --git a/scripts/upgrade b/scripts/upgrade index 1e54fd0..38d605d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,6 +34,7 @@ datadir=$(ynh_app_setting_get --app="$app" --key=datadir) cache_memory_target=$(ynh_app_setting_get --app="$app" --key=cache_memory_target) +instance_federation_mode=$(ynh_app_setting_get --app="$app" --key=instance_federation_mode) instance_expose_peers=$(ynh_app_setting_get --app="$app" --key=instance_expose_peers) instance_expose_suspended=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended) instance_expose_suspended_web=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended_web) @@ -326,6 +327,15 @@ then ynh_app_setting_set --app="$app" --key=instance_inject_mastodon_version --value="$instance_inject_mastodon_version" fi +# Upgrade from <0.12.0~ynh1: +if ynh_compare_current_package_version --comparison lt --version 0.12.0~ynh1 || [ -z "$instance_federation_mode" ] +then + # declaration of new parameter + instance_federation_mode="blocklist" + # registration of parameter + ynh_app_setting_set --app="$app" --key=instance_federation_mode --value="$instance_federation_mode" +fi + #================================================= # CREATE DEDICATED USER #================================================= From 697369076c00cccc126dd3d2d404c209583da914 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Tue, 17 Oct 2023 22:22:18 +0200 Subject: [PATCH 04/11] much better refactoring --- scripts/_common.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 76f3cfc..ce2404a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,15 +15,15 @@ pkg_dependencies="postgresql postgresql-contrib" # ($YNH_ARCH returns armhf for both...) detect_arch(){ local architecture - if [ -n "$(uname -m | grep [arm64,aarch64]; then + if uname -m | grep -q "[arm64,aarch64]" ; then architecture="arm64" - elif [ -n "$(uname -m | grep 64)" ]; then + elif uname -m | grep -q "64" ; then architecture="x86-64" - elif [ -n "$(uname -m | grep 86)" ]; then + elif uname -m | grep -q "86" ; then architecture="i386" - elif [ -n "$(uname -m | grep armv6)" ]; then + elif uname -m | grep -q "armv6" ; then architecture="armv6" - elif [ -n "$(uname -m | grep armv7)" ]; then + elif uname -m | grep -q "armv7" ; then architecture="armv7" else architecture="unknown" From 28fd5d25a3713a9ec2f0fddb126083fb3d25baa9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 23 Oct 2023 14:30:51 +0000 Subject: [PATCH 05/11] Upgrade to v0.12.0 --- conf/arm64.src | 6 +++--- conf/armv6.src | 6 +++--- conf/armv7.src | 6 +++--- conf/i386.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/conf/arm64.src b/conf/arm64.src index 6e6a22e..d993b9c 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.11.1/gotosocial_0.11.1_linux_arm64.tar.gz -SOURCE_SUM=d5478c5833df4c7a0510b452546640e10575d2fa45fa43dbbc2e2714f762362a +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.12.0/gotosocial_0.12.0_linux_arm64.tar.gz +SOURCE_SUM=846d0700d34358bcc9ed452ed1459ed072ba6abe0dcf760bad73a465579930a8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.11.1_linux_arm64.tar.gz +SOURCE_FILENAME=gotosocial_0.12.0_linux_arm64.tar.gz diff --git a/conf/armv6.src b/conf/armv6.src index b039f2c..f4b6377 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.11.1/gotosocial_0.11.1_linux_armv6.tar.gz -SOURCE_SUM=aadd5ecab1d2a42923ca34bdea7791ab5682ef46b36e9b515a57b55217f397bc +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.12.0/gotosocial_0.12.0_linux_armv6.tar.gz +SOURCE_SUM=fa16467b5fb72d34b03f80161b4d5aab02c4a55296768835fa99eb843909aec5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.11.1_linux_armv6.tar.gz +SOURCE_FILENAME=gotosocial_0.12.0_linux_armv6.tar.gz diff --git a/conf/armv7.src b/conf/armv7.src index 9ff86cc..4e15023 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.11.1/gotosocial_0.11.1_linux_armv7.tar.gz -SOURCE_SUM=6c19c23f7476ab0cd5e7e698bfd47bafa582eba84b810dcb8539e97a419cc136 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.12.0/gotosocial_0.12.0_linux_armv7.tar.gz +SOURCE_SUM=44c4ce23a50ef31020693a05f96ec0408dbd41f6e9bd928aa979bb820f96d84e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.11.1_linux_armv7.tar.gz +SOURCE_FILENAME=gotosocial_0.12.0_linux_armv7.tar.gz diff --git a/conf/i386.src b/conf/i386.src index a9d1351..a7655ef 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.11.1/gotosocial_0.11.1_linux_386.tar.gz -SOURCE_SUM=f66f455c7406ac40ff04320cb8f030b5affe8acd39937a8727b0ea53887c7227 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.12.0/gotosocial_0.12.0_linux_386.tar.gz +SOURCE_SUM=e91e4af12341f73bb1be58d953679e09ab24f47a4ccfc417f1ec4e3fbf6a97c2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.11.1_linux_386.tar.gz +SOURCE_FILENAME=gotosocial_0.12.0_linux_386.tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index b539f88..f2fe2be 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.11.1/gotosocial_0.11.1_linux_amd64.tar.gz -SOURCE_SUM=4e44a5cb4044a523c51b5d178dfd06efb077a17dac22a9a170d6204cb7aed407 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.12.0/gotosocial_0.12.0_linux_amd64.tar.gz +SOURCE_SUM=e1f309b1c8c7b224bfd12cefcd6c9111b15447d8ab7713e89d0066507ca06c45 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.11.1_linux_amd64.tar.gz +SOURCE_FILENAME=gotosocial_0.12.0_linux_amd64.tar.gz diff --git a/manifest.json b/manifest.json index 2bd1d0b..35f812b 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.11.1~ynh4", + "version": "0.12.0~ynh1", "url": "https://github.com/superseriousbusiness/gotosocial", "upstream": { "license": "AGPL-3.0-only", @@ -106,4 +106,4 @@ } ] } -} \ No newline at end of file +} From aec4184fd67168bf3ffe4de6b98c95bec55b921a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 23 Oct 2023 14:30:58 +0000 Subject: [PATCH 06/11] 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 b26314b..33a53be 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.11.1~ynh4 +**Shipped version:** 0.12.0~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b5659ca..73720b2 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.11.1~ynh4 +**Version incluse :** 0.12.0~ynh1 ## Captures d’écran From 389d9da7b3e31d8ef28db7384671f1f1de615e1a Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 23 Oct 2023 16:54:43 +0200 Subject: [PATCH 07/11] fix grep --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ce2404a..18ae128 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ pkg_dependencies="postgresql postgresql-contrib" # ($YNH_ARCH returns armhf for both...) detect_arch(){ local architecture - if uname -m | grep -q "[arm64,aarch64]" ; then + if uname -m | grep -q -i -E "arm64|aarch64" ; then architecture="arm64" elif uname -m | grep -q "64" ; then architecture="x86-64" From a8f8c23019941a5ad02a616690b57b3d396b7124 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 23 Oct 2023 16:58:56 +0200 Subject: [PATCH 08/11] deleting dupe --- conf/config.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index a86aa1e..8352359 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -977,21 +977,3 @@ advanced-sender-multiplier: 2 # Example: ["s3.example.org", "some-bucket-name.s3.example.org"] # Default: [] advanced-csp-extra-uris: [] - -# Array of string. Extra URIs to add to 'img-src' and 'media-src' -# when building the Content-Security-Policy header for your instance. -# -# This can be used to allow the browser to load resources from additional -# sources like S3 buckets and so on when viewing your instance's pages -# and profiles in the browser. -# -# Since non-proxying S3 storage will be probed on instance launch to -# generate a correct Content-Security-Policy, you probably won't need -# to ever touch this setting, but it's included in the 'spirit of more -# configurable (usually) means more good'. -# -# See: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -# -# Example: ["s3.example.org", "some-bucket-name.s3.example.org"] -# Default: [] -advanced-csp-extra-uris: [] \ No newline at end of file From 590675152183aa2bc03e10295d00dc7c44803270 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 23 Oct 2023 17:07:44 +0200 Subject: [PATCH 09/11] remove unnecessary arguments --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 18ae128..528d5fd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ pkg_dependencies="postgresql postgresql-contrib" # ($YNH_ARCH returns armhf for both...) detect_arch(){ local architecture - if uname -m | grep -q -i -E "arm64|aarch64" ; then + if uname -m | grep -q -E "arm64|aarch64" ; then architecture="arm64" elif uname -m | grep -q "64" ; then architecture="x86-64" From eff17d61cc55b85a69881f9705896eeb8d8049da Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 23 Oct 2023 17:15:14 +0200 Subject: [PATCH 10/11] add: instance_federation_mode --- config_panel.toml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config_panel.toml b/config_panel.toml index c1b6a61..10f16f3 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -226,6 +226,18 @@ name = "Instance config" help = "Config pertaining to instance federation settings, pages to hide/expose, etc." +[main.instance.instance_federation_mode] +ask.en = "Federation mode to use for this instance" +ask.fr = "Le mode de fédération à utiliser pour cette instance" +bind = "instance-federation-mode:__FINALPATH__/config.yaml" +choices = ["blocklist", "allowlist"] +default = "blocklist" +help.en = """blocklist: open federation by default. Only instances that are explicitly blocked will be denied (unless they are also explicitly allowed).\ +allowlist: closed federation by default. Only instances that are explicitly allowed will be able to interact with this instance.""" +help.fr = """blocklist : fédération ouverte par défaut. Seules les instances explicitement bloquées seront exclues (à moins qu'elles ne soient également explicitement autorisées).\ +allowlist : fédération fermée par défaut. Seules les instances explicitement autorisées pourront interagir avec cette instance.""" +type = "select" + [main.instance.landing_page_user] ask.en = "Landing page user" ask.fr = "Utilisateurice en tant que page d'accueil" From 0478876ca5585443ff8324b5f827284b99f73316 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 23 Oct 2023 17:24:41 +0200 Subject: [PATCH 11/11] delete upgrade tests older than 1 year & add test for 0.11.0~ynh1 --- check_process | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/check_process b/check_process index 6035d12..40045f7 100644 --- a/check_process +++ b/check_process @@ -17,10 +17,8 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=29c7d0df5dd6e3d90070f242b74cce980676cd72 - upgrade=1 from_commit=5c1c052995a10d899abcb0e4d4fa1c1dc35f84a5 - upgrade=1 from_commit=1b6c1c62e022f04afa02bf128f419e77a72bf1e9 upgrade=1 from_commit=9a6d018337c7d83193282830ff9d9e9b0ae3a733 + upgrade=1 from_commit=2750ec2d59df9c988b7a8624104063fcf7f1c198 backup_restore=1 multi_instance=1 port_already_use=1 @@ -29,11 +27,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=29c7d0df5dd6e3d90070f242b74cce980676cd72 - name=0.3.6~ynh1 - ; commit=5c1c052995a10d899abcb0e4d4fa1c1dc35f84a5 - name=v0.4.0~ynh1 - ; commit=1b6c1c62e022f04afa02bf128f419e77a72bf1e9 - name=0.5.2~ynh2 ; commit=9a6d018337c7d83193282830ff9d9e9b0ae3a733 - name=0.6.0~ynh1 \ No newline at end of file + name=0.6.0~ynh1 + ; commit=2750ec2d59df9c988b7a8624104063fcf7f1c198 + name=0.11.0~ynh1