From 43184e1904eb38dba11fa99be828bdfa736e6300 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Thu, 15 Apr 2021 22:46:03 +0200 Subject: [PATCH] Glitch it is Fix version --- README.md | 28 ++++++++-------- README_fr.md | 28 ++++++++-------- check_process | 32 ------------------- conf/app.src | 4 +-- ...ekiq.service => glitchsoc-sidekiq.service} | 0 ...ng.service => glitchsoc-streaming.service} | 0 ...odon-web.service => glitchsoc-web.service} | 0 issue_template.md | 4 +-- manifest.json | 8 ++--- scripts/install | 10 +++--- scripts/upgrade | 12 +++---- 11 files changed, 47 insertions(+), 79 deletions(-) rename conf/{mastodon-sidekiq.service => glitchsoc-sidekiq.service} (100%) rename conf/{mastodon-streaming.service => glitchsoc-streaming.service} (100%) rename conf/{mastodon-web.service => glitchsoc-web.service} (100%) diff --git a/README.md b/README.md index a4bd460..9aa9a0a 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ -# Mastodon for YunoHost +# Glich-Soc for YunoHost [![Integration level](https://dash.yunohost.org/integration/mastodon.svg)](https://dash.yunohost.org/appci/app/mastodon) ![](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) -[![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) +[![Install Glich-Soc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Mastodon quickly and simply on a YunoHost server. +> *This package allows you to install Glich-Soc quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. +Glich-Soc is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. **Shipped version:** 3.3.0 ## Important points to read before installing -1. **Mastodon** require a dedicated **root domain**, eg. mastodon.domain.tld -1. The user choosen during the installation is automatically created in Mastodon with admin rights +1. **Glich-Soc** require a dedicated **root domain**, eg. glitchsoc.domain.tld +1. The user choosen during the installation is automatically created in Glich-Soc with admin rights 1. At the end of the installation a mail is sent to the user with the automatically generated password -1. It seems important to close the inscriptions for your Mastodon, so that it remains a private body. We invite you to block remote malicious instances from the administration interface. You can also add text on your home page. +1. It seems important to close the inscriptions for your Glich-Soc, so that it remains a private body. We invite you to block remote malicious instances from the administration interface. You can also add text on your home page. ## Screenshots @@ -32,7 +32,7 @@ Mastodon is a free, open-source microblogging social network. It is a decentrali ``` $ sudo apt-get install screen $ screen -$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git +$ sudo yunohost app install https://github.com/YunoHost-Apps/glitch-soc_ynh.git ``` Recover after disconnect: ``` @@ -44,7 +44,7 @@ $ screen -r #### Using *screen* highly recommended -`$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug ` +`$ sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitch-soc_ynh --debug ` ## Documentation @@ -63,20 +63,20 @@ LDAP authentication is activated. All YunoHost users can authenticate. ## Links - * Report a bug: https://github.com/YunoHost-Apps/mastodon_ynh/issues + * Report a bug: https://github.com/YunoHost-Apps/glitch-soc_ynh/issues * App website: https://joinmastodon.org/ - * Upstream app repository: https://github.com/tootsuite/mastodon + * Upstream app repository: https://github.com/glitch-soc/mastodon * YunoHost website: https://yunohost.org/ --- ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/glitch-soc_ynh/tree/testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/glitch-soc_ynh/tree/testing --debug or -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitch-soc_ynh/tree/testing --debug ``` diff --git a/README_fr.md b/README_fr.md index 1f1fc84..fd1f776 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,24 +1,24 @@ -# Mastodon pour YunoHost +# Glich-Soc pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/mastodon.svg)](https://dash.yunohost.org/appci/app/mastodon) ![](https://ci-apps.yunohost.org/ci/badges/mastodon.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mastodon.maintain.svg) -[![Installer Mastodon avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mastodon) +[![Installer Glich-Soc avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Mastodon rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Glich-Soc rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble -Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. +Glich-Soc est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Glich-Soc évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. **Version incluse:** 3.3.0 ## Points importants à lire avant l'installation -1. **Mastodon** nécessite un **nom de domaine** dédié, par exemple : mastodon.domain.tld -1. L'utilisateur sélectionné pendant l'installation sera créé automatiquement dans Mastodon avec des droits d'administration. +1. **Glich-Soc** nécessite un **nom de domaine** dédié, par exemple : glitchsoc.domain.tld +1. L'utilisateur sélectionné pendant l'installation sera créé automatiquement dans Glich-Soc avec des droits d'administration. 1. À la fin de l'installation, un mail est envoyé à cet utilisateur avec un mot de passe généré automatiquement. -1. Pour que votre instance Mastodon reste privée, il est important de fermer les inscriptions. Nous vous invitons à bloquer les instances distantes indésirables depuis l'interface d'administration. Vous pouvez également ajouter un texte sur votre page d'accueil dans l'administration. +1. Pour que votre instance Glich-Soc reste privée, il est important de fermer les inscriptions. Nous vous invitons à bloquer les instances distantes indésirables depuis l'interface d'administration. Vous pouvez également ajouter un texte sur votre page d'accueil dans l'administration. ## Captures d'écran @@ -32,7 +32,7 @@ Mastodon est un réseau social de microblog auto-hébergé et open source. C'est ``` $ sudo apt-get install screen $ screen -$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git +$ sudo yunohost app install https://github.com/YunoHost-Apps/glitch-soc_ynh.git ``` Récupérer l'installation après une deconnection : ``` @@ -45,7 +45,7 @@ L'utilisateur admin est créé automatiquement comme : user@domain.tld #### Utilisation de *screen* fortement recommandée -`$ sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh --debug ` +`$ sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitch-soc_ynh --debug ` ## Documentation @@ -64,20 +64,20 @@ L'authentification LDAP est activée. Tous les utilisateurs YunoHost peuvent s'a ## Liens - * Signaler un bug : https://github.com/YunoHost-Apps/mastodon_ynh/issues + * Signaler un bug : https://github.com/YunoHost-Apps/glitch-soc_ynh/issues * Site de l'application : https://joinmastodon.org/ - * Dépôt de l'application principale : https://github.com/tootsuite/mastodon + * Dépôt de l'application principale : https://github.com/glitch-soc/mastodon * Site web YunoHost : https://yunohost.org/ --- ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/glitch-soc_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/glitch-soc_ynh/tree/testing --debug ou -sudo yunohost app upgrade mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh/tree/testing --debug +sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitch-soc_ynh/tree/testing --debug ``` diff --git a/check_process b/check_process index b0acafe..03f517a 100644 --- a/check_process +++ b/check_process @@ -12,22 +12,6 @@ setup_private=1 setup_public=1 upgrade=1 - # 3.1.2~ynh2 - #upgrade=1 from_commit=7e1f4c2dee5f2c8374686aea62f4648cdf2722c3 - # 3.1.2~ynh3 - #upgrade=1 from_commit=6b30109fc986d83166b1805ec3ad7e28200e3743 - # 3.1.2~ynh4 - upgrade=1 from_commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef - # 3.2.0~ynh1 - upgrade=1 from_commit=bde14cc4496445fdfed4616ac44fc9527c8369fd - # 3.2.1~ynh1 - upgrade=1 from_commit=248b717f373f3c82bdb19c33cf20980494608697 - # 3.2.1~ynh2 - upgrade=1 from_commit=74908bf3e70c134bc838c7db3ae8b5aa0938cd75 - # 3.2.2~ynh1 - upgrade=1 from_commit=a233ccc644d97aa89756fac9f0ce68c98d81d27c - # 3.3.0~ynh1 - upgrade=1 from_commit=a7eb98db3fac0697b923072dcd78c1ca04bf0a12 backup_restore=1 multi_instance=1 port_already_use=0 @@ -36,19 +20,3 @@ Email=yalh@yahoo.com Notification=all ;;; Upgrade options - ; commit=7e1f4c2dee5f2c8374686aea62f4648cdf2722c3 - name=3.1.2~ynh2 - ; commit=6b30109fc986d83166b1805ec3ad7e28200e3743 - name=3.1.2~ynh3 - ; commit=d3df899e0a99a63ee1cf7ad845cc513aeaaf30ef - name=3.1.2~ynh4 - ; commit=bde14cc4496445fdfed4616ac44fc9527c8369fd - name=3.2.0~ynh1 - ; commit=248b717f373f3c82bdb19c33cf20980494608697 - name=3.2.1~ynh1 - ; commit=74908bf3e70c134bc838c7db3ae8b5aa0938cd75 - name=3.2.1~ynh2 - ; commit=a233ccc644d97aa89756fac9f0ce68c98d81d27c - name=3.2.2~ynh1 - ; commit=a7eb98db3fac0697b923072dcd78c1ca04bf0a12 - name=3.3.0~ynh1 diff --git a/conf/app.src b/conf/app.src index 6383dac..4ac0034 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/1efcbb9cfe36d4428ef6af988bb0d7b25ace3971.tar.gz -SOURCE_SUM=4ecbfd34ea37d739fbcec11cf9b812e8d8f60f6367f8ce255a062d5d64d92557 +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/df326b8b5c0659edb2aca77690a892f228b0e099.tar.gz +SOURCE_SUM=9791bd00b76653908fd0d66533e5b31eecff6759f77794e8b64a4ebe2fe3ae50 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/mastodon-sidekiq.service b/conf/glitchsoc-sidekiq.service similarity index 100% rename from conf/mastodon-sidekiq.service rename to conf/glitchsoc-sidekiq.service diff --git a/conf/mastodon-streaming.service b/conf/glitchsoc-streaming.service similarity index 100% rename from conf/mastodon-streaming.service rename to conf/glitchsoc-streaming.service diff --git a/conf/mastodon-web.service b/conf/glitchsoc-web.service similarity index 100% rename from conf/mastodon-web.service rename to conf/glitchsoc-web.service diff --git a/issue_template.md b/issue_template.md index c6c9254..07fe1ff 100644 --- a/issue_template.md +++ b/issue_template.md @@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to Mastodon itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to Glich-Soc itself. Refer to its documentation or repository for help.* - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install mastodon + sudo yunohost app install glitchsoc ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/manifest.json b/manifest.json index d6aa9f1..1eb1dfe 100644 --- a/manifest.json +++ b/manifest.json @@ -1,13 +1,13 @@ { - "name": "Mastodon", - "id": "mastodon", + "name": "Glich-Soc", + "id": "glitchsoc", "packaging_format": 1, "description": { "en": "A libre and federated social network.", "fr": "Un réseau social libre et fédéré." }, - "version": "3.3.0~ynh2", - "url": "https://github.com/tootsuite/mastodon", + "version": "2021-04-11-ynh2", + "url": "https://github.com/glitch-soc/mastodon", "license": "AGPL-3.0-or-later", "maintainer": { "name": "yalh76" diff --git a/scripts/install b/scripts/install index f5da202..47f636e 100644 --- a/scripts/install +++ b/scripts/install @@ -190,14 +190,14 @@ chown $app:$app "$final_path/live/config/settings.yml" ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config -ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT" -ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT" -ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node" +ynh_add_systemd_config --service="$app-web" --template="glitchsoc-web.service" --others_var="port_web RBENV_ROOT" +ynh_add_systemd_config --service="$app-sidekiq" --template="glitchsoc-sidekiq.service" --others_var="RBENV_ROOT" +ynh_add_systemd_config --service="$app-streaming" --template="glitchsoc-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node" #================================================= -# INSTALLING MASTODON +# INSTALLING GLITCH-SOC #================================================= -ynh_script_progression --message="Installing Mastodon..." +ynh_script_progression --message="Installing Glich-Soc..." pushd "$final_path/live" sudo -u $app $ynh_ruby_load_path bin/bundle config deployment 'true' diff --git a/scripts/upgrade b/scripts/upgrade index 86555dc..8fd69e4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,7 +156,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." - # Download Mastodon + # Download Glich-Soc tmpdir="$(mktemp -d)" mkdir $tmpdir/system @@ -247,14 +247,14 @@ chown $app:$app "$config" ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config -ynh_add_systemd_config --service="$app-web" --template="mastodon-web.service" --others_var="port_web RBENV_ROOT" -ynh_add_systemd_config --service="$app-sidekiq" --template="mastodon-sidekiq.service" --others_var="RBENV_ROOT" -ynh_add_systemd_config --service="$app-streaming" --template="mastodon-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node" +ynh_add_systemd_config --service="$app-web" --template="glitchsoc-web.service" --others_var="port_web RBENV_ROOT" +ynh_add_systemd_config --service="$app-sidekiq" --template="glitchsoc-sidekiq.service" --others_var="RBENV_ROOT" +ynh_add_systemd_config --service="$app-streaming" --template="glitchsoc-streaming.service" --others_var="port_stream ynh_node_load_PATH ynh_node" #================================================= -# UPGRADE MASTODON +# UPGRADE GLITCH-SOC #================================================= -ynh_script_progression --message="Upgrading Mastodon..." +ynh_script_progression --message="Upgrading Glich-Soc..." chown -R "$app": "$final_path"