YunoHost-Apps/mattermost_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mattermost_ynh.git synced 2024-09-03 19:36:29 +02:00
Code Issues Activity Actions

Remove ynh_detect_arch helper (#317)

Browse source 
ynh_detect_arch is deprecated in favor of YNH_ARCH

* Add  #315 and #316
This commit is contained in:
Éric Gaspar 2021-12-06 12:37:56 +01:00 • committed by GitHub
parent 702a6da453
commit 678a1d80cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -50,6 +50,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t
## Configuration
* How to configure this app: From an admin panel, a plain file with SSH.
* How to change from edition version to another (Team<->Enterprise) : Modify the `settings.yml` in the apps directory `/etc/yunohost/apps/mattermost_instance/settings.yml` and replace the version to wich you whant : Team or Enterprise. Update your apps and verify the *About* on your mattermost
## YunoHost specific features

1
README_fr.md
View file

@ -46,6 +46,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou
## Configuration
* Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH.
* Comment changer d'une version à une autre (Team<->Enterprise) : Modifiez le `settings.yml` dans le répertoire de l'application `/etc/yunohost/apps/mattermost_instance/settings.yml` et remplacez la version avec celle que vous voulez : Team ou Enterprise. Mettez à jour votre application et vérifiez dans le *À Propos* sur la console système de votre application.
## Caractéristiques spécifiques YunoHost

0
conf/x86-64.src → conf/amd64.src
View file

0
conf/arm.src → conf/armhf.src
View file

5
conf/nginx.conf
View file

@ -34,9 +34,4 @@ location __PATH__/ {
#proxy_cache_use_stale timeout;
#proxy_cache_lock on;
proxy_pass http://127.0.0.1:__PORT__;
# Yunohost addition: redirect HTTP to HTTPS
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
}

1
doc/DISCLAIMER.md
View file

@ -1,6 +1,7 @@
## Configuration
* How to configure this app: From an admin panel, a plain file with SSH.
* How to change from edition version to another (Team<->Enterprise) : Modify the `settings.yml` in the apps directory `/etc/yunohost/apps/mattermost_instance/settings.yml` and replace the version to wich you whant : Team or Enterprise. Update your apps and verify the *About* on your mattermost
## YunoHost specific features

1
doc/DISCLAIMER_fr.md
View file

@ -1,6 +1,7 @@
## Configuration
* Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH.
* Comment changer d'une version à une autre (Team<->Enterprise) : Modifiez le `settings.yml` dans le répertoire de l'application `/etc/yunohost/apps/mattermost_instance/settings.yml` et remplacez la version avec celle que vous voulez : Team ou Enterprise. Mettez à jour votre application et vérifiez dans le *À Propos* sur la console système de votre application.
## Caractéristiques spécifiques YunoHost

2
manifest.json
View file

@ -26,7 +26,7 @@
"mysql"
],
"requirements": {
"yunohost": ">= 4.2.0"
"yunohost": ">= 4.3.0"
},
"arguments": {
"install": [

26
scripts/_common.sh
View file

@ -12,32 +12,6 @@
# EXPERIMENTAL HELPERS
#=================================================
# Check the architecture
#
# example: architecture=$(ynh_detect_arch)
#
# usage: ynh_detect_arch
#
# Requires YunoHost version 2.2.4 or higher.
ynh_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 armv7)" ]; then
architecture="arm"
elif [ -n "$(uname -m | grep armv6)" ]; then
architecture="arm"
elif [ -n "$(uname -m | grep armv5)" ]; then
architecture="arm"
else
architecture="unknown"
fi
echo $architecture
}
#=================================================
# FUTURE OFFICIAL HELPERS
#=================================================

2
scripts/install
View file

@ -31,7 +31,7 @@ email=$(ynh_user_get_info --username=$admin --key=mail)
password=$YNH_APP_ARG_PASSWORD
language=$YNH_APP_ARG_LANGUAGE
team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME
architecture=$(ynh_detect_arch)
architecture=$YNH_ARCH
version=$YNH_APP_ARG_VERSION
app=$YNH_APP_INSTANCE_NAME

2
scripts/upgrade
View file

@ -32,7 +32,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
language=$(ynh_app_setting_get --app=$app --key=language)
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
architecture=$(ynh_detect_arch)
architecture=$YNH_ARCH
version=$(ynh_app_setting_get --app=$app --key=version)
data_path=$(ynh_app_setting_get --app=$app --key=data_path)