mirror of
https://github.com/YunoHost-Apps/gotosocial_ynh.git
synced 2024-09-03 19:16:06 +02:00
Merge branch 'testing' into config_panel
This commit is contained in:
OniriCorpe
GitHub
commit
91459b98e8
11 changed files with 63 additions and 18 deletions
|
|
@ -24,7 +24,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.2.1~ynh2
|
||||
**Shipped version:** 0.2.1~ynh4
|
||||
|
||||
|
||||
|
||||
|
|
@ -34,11 +34,16 @@ Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
|
|||
|
||||
## Disclaimers / important information
|
||||
|
||||
GoToSocial require a dedicated root domain, for example: gotosocial.domain.tld.
|
||||
GoToSocial is still in alpha and **may be unstable**.
|
||||
|
||||
GoToSocial require a **dedicated root domain**, for example: gotosocial.domain.tld.
|
||||
|
||||
This package is not-working single-sign on or LDAP integration.
|
||||
You will have a separate account from the rest of your Yunohost server, potentially with a different username and password.
|
||||
|
||||
GoToSocial **does not provide a user interface**.
|
||||
You will need to use a Mastodon-compatible client such as [Tusky](https://tusky.app/) on Android or an instance of [Pinafore](https://pinafore.social/) on the Web.
|
||||
|
||||
You can login to [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) to administrate your GoToSocial instance.
|
||||
The [source code of this administration panel](https://github.com/superseriousbusiness/gotosocial-admin) is available on github.
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,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.2.1~ynh2
|
||||
**Version incluse :** 0.2.1~ynh4
|
||||
|
||||
|
||||
|
||||
|
|
@ -30,11 +30,16 @@ Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](http
|
|||
|
||||
## Avertissements / informations importantes
|
||||
|
||||
GoToSocial nécessite un nom de domaine dédié, par exemple : gotosocial.domain.tld.
|
||||
GoToSocial est encore en alpha et **peut etre instable**.
|
||||
|
||||
GoToSocial nécessite un **nom de domaine dédié**, par exemple : gotosocial.domain.tld.
|
||||
|
||||
Ce paquet ne fonctionne pas avec l'authentification unique (SSO) ou l'intégration LDAP.
|
||||
Vous aurez un compte séparé du reste de votre serveur Yunohost, avec potentiellement un nom d'utilisateur et un mot de passe différent.
|
||||
|
||||
GoToSocial **ne dispose pas d'une interface utilisateur-ice**.
|
||||
Vous devrez utiliser un client compatible avec Mastodon comme [Tusky](https://tusky.app/) sur Android ou une instance de [Pinafore](https://pinafore.social/) en Web.
|
||||
|
||||
Vous pouvez vous connecter sur [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) pour administrer votre insance GoToSocial.
|
||||
Le [code source de cette interface d'administration](https://github.com/superseriousbusiness/gotosocial-admin) est consultable sur github.
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
setup_private=0
|
||||
setup_public=1
|
||||
upgrade=1
|
||||
upgrade=0 from_commit=CommitHash
|
||||
upgrade=1 from_commit=460048e78df8a195b1eca5994a4699079954b312
|
||||
backup_restore=1
|
||||
multi_instance=1
|
||||
port_already_use=1
|
||||
|
|
@ -27,6 +27,5 @@
|
|||
Email=
|
||||
Notification=none
|
||||
;;; Upgrade options
|
||||
; commit=CommitHash
|
||||
name=Name and date of the commit.
|
||||
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&password=pass&port=666&
|
||||
; commit=460048e78df8a195b1eca5994a4699079954b312
|
||||
name=0.2.1~ynh3
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ account-domain: ""
|
|||
# letsencrypt, it should still be https.
|
||||
# Options: ["http","https"]
|
||||
# Default: "https"
|
||||
protocol: "http"
|
||||
protocol: "https"
|
||||
|
||||
# String. Address to bind the GoToSocial server to.
|
||||
# This can be an IPv4 address or an IPv6 address (surrounded in square brackets), or a hostname.
|
||||
|
|
@ -372,12 +372,12 @@ oidc-scopes:
|
|||
# If this is not set, smtp will not be used to send emails, and you can ignore the other settings.
|
||||
# Examples: ["mail.example.org", "localhost"]
|
||||
# Default: ""
|
||||
smtp-host: ""
|
||||
smtp-host: "localhost"
|
||||
|
||||
# Int. Port to use to connect to the smtp server.
|
||||
# Examples: []
|
||||
# Default: 0
|
||||
smtp-port: 0
|
||||
smtp-port: 25
|
||||
|
||||
# String. Username to use when authenticating with the smtp server.
|
||||
# This should have been provided to you by your smtp host.
|
||||
|
|
@ -395,7 +395,7 @@ smtp-password: ""
|
|||
# String. 'From' address for sent emails.
|
||||
# Examples: ["mail@example.org"]
|
||||
# Default: ""
|
||||
smtp-from: ""
|
||||
smtp-from: "GoToSocial@__DOMAIN__"
|
||||
|
||||
#########################
|
||||
##### SYSLOG CONFIG #####
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
GoToSocial require a dedicated root domain, for example: gotosocial.domain.tld.
|
||||
GoToSocial is still in alpha and **may be unstable**.
|
||||
|
||||
GoToSocial require a **dedicated root domain**, for example: gotosocial.domain.tld.
|
||||
|
||||
This package is not-working single-sign on or LDAP integration.
|
||||
You will have a separate account from the rest of your Yunohost server, potentially with a different username and password.
|
||||
|
||||
GoToSocial **does not provide a user interface**.
|
||||
You will need to use a Mastodon-compatible client such as [Tusky](https://tusky.app/) on Android or an instance of [Pinafore](https://pinafore.social/) on the Web.
|
||||
|
||||
You can login to [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) to administrate your GoToSocial instance.
|
||||
The [source code of this administration panel](https://github.com/superseriousbusiness/gotosocial-admin) is available on github.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,12 @@
|
|||
GoToSocial nécessite un nom de domaine dédié, par exemple : gotosocial.domain.tld.
|
||||
GoToSocial est encore en alpha et **peut etre instable**.
|
||||
|
||||
GoToSocial nécessite un **nom de domaine dédié**, par exemple : gotosocial.domain.tld.
|
||||
|
||||
Ce paquet ne fonctionne pas avec l'authentification unique (SSO) ou l'intégration LDAP.
|
||||
Vous aurez un compte séparé du reste de votre serveur Yunohost, avec potentiellement un nom d'utilisateur et un mot de passe différent.
|
||||
|
||||
GoToSocial **ne dispose pas d'une interface utilisateur-ice**.
|
||||
Vous devrez utiliser un client compatible avec Mastodon comme [Tusky](https://tusky.app/) sur Android ou une instance de [Pinafore](https://pinafore.social/) en Web.
|
||||
|
||||
Vous pouvez vous connecter sur [gts.superseriousbusiness.org/admin](https://gts.superseriousbusiness.org/admin/) pour administrer votre insance GoToSocial.
|
||||
Le [code source de cette interface d'administration](https://github.com/superseriousbusiness/gotosocial-admin) est consultable sur github.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"en": "An ActivityPub social network server, written in Golang.",
|
||||
"fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
|
||||
},
|
||||
"version": "0.2.1~ynh2",
|
||||
"version": "0.2.1~ynh4",
|
||||
"url": "https://github.com/superseriousbusiness/gotosocial",
|
||||
"upstream": {
|
||||
"license": " AGPL-3.0-only",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,26 @@ pkg_dependencies="postgresql postgresql-contrib"
|
|||
# PERSONAL HELPERS
|
||||
#=================================================
|
||||
|
||||
# custom function to detect armv6 and armv7
|
||||
# ($YNH_ARCH returns armhf for both...)
|
||||
detect_arch(){
|
||||
local architecture
|
||||
if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
|
||||
architecture="arm64"
|
||||
elif [ -n "$(uname -m | grep 64)" ]; then
|
||||
architecture="x86-64"
|
||||
elif [ -n "$(uname -m | grep 86)" ]; then
|
||||
architecture="i386"
|
||||
elif [ -n "$(uname -m | grep armv6)" ]; then
|
||||
architecture="armv6"
|
||||
elif [ -n "$(uname -m | grep armv7)" ]; then
|
||||
architecture="armv7"
|
||||
else
|
||||
architecture="unknown"
|
||||
fi
|
||||
echo $architecture
|
||||
}
|
||||
|
||||
#=================================================
|
||||
# EXPERIMENTAL HELPERS
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -140,7 +140,12 @@ ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
|
|||
#=================================================
|
||||
ynh_script_progression --message="Setting up source files..." --weight=1
|
||||
|
||||
architecture=$YNH_ARCH
|
||||
### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
|
||||
### downloaded from an upstream source, like a git repository.
|
||||
### `ynh_setup_source` use the file conf/app.src
|
||||
|
||||
# detect_arch comes from _common.sh / personnal helpers
|
||||
architecture=$(detect_arch)
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$final_path" --source_id=$architecture
|
||||
|
|
|
|||
|
|
@ -148,8 +148,9 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
|
|||
then
|
||||
ynh_script_progression --message="Upgrading source files..."
|
||||
|
||||
architecture=$YNH_ARCH
|
||||
|
||||
# detect_arch comes from _common.sh / personnal helpers
|
||||
architecture=$(detect_arch)
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$final_path" --source_id=$architecture --keep="config.yaml"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue