diff --git a/README.md b/README.md index 5054536..3ab4768 100644 --- a/README.md +++ b/README.md @@ -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~ynh3 @@ -34,11 +34,16 @@ Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org). ## Disclaimers / important information +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 [https://tusky.app/](Tusky) on Android or an instance of [https://pinafore.social/](Pinafore) 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. diff --git a/README_fr.md b/README_fr.md index b42be2f..813040e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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~ynh3 @@ -30,11 +30,16 @@ Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](http ## Avertissements / informations importantes +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 [https://tusky.app/](Tusky) sur Android ou une instance de [https://pinafore.social/](Pinafore) 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. diff --git a/conf/config.yaml b/conf/config.yaml index 8de7d54..d3eccd7 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -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. diff --git a/conf/amd64.src b/conf/x86-64.src similarity index 100% rename from conf/amd64.src rename to conf/x86-64.src diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 16d87b8..fdc0ebc 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,7 +1,12 @@ +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 [https://tusky.app/](Tusky) on Android or an instance of [https://pinafore.social/](Pinafore) 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. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 9f7de3f..3c1ec2c 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,7 +1,12 @@ +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 [https://tusky.app/](Tusky) sur Android ou une instance de [https://pinafore.social/](Pinafore) 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. diff --git a/manifest.json b/manifest.json index 77280bf..098c1f7 100644 --- a/manifest.json +++ b/manifest.json @@ -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~ynh3", "url": "https://github.com/superseriousbusiness/gotosocial", "upstream": { "license": " AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index c0220ac..d5c690b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -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 #================================================= diff --git a/scripts/install b/scripts/install index d29a529..ecff842 100755 --- a/scripts/install +++ b/scripts/install @@ -140,7 +140,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ### downloaded from an upstream source, like a git repository. ### `ynh_setup_source` use the file conf/app.src -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 diff --git a/scripts/upgrade b/scripts/upgrade index 291f73f..3630a1b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,8 +83,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