diff --git a/README.md b/README.md index 0d161ff..da066b4 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/README_fr.md b/README_fr.md index b15ea3b..593a7ec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -45,7 +45,8 @@ 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 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 diff --git a/conf/x86-64.src b/conf/amd64.src similarity index 100% rename from conf/x86-64.src rename to conf/amd64.src diff --git a/conf/arm.src b/conf/armhf.src similarity index 100% rename from conf/arm.src rename to conf/armhf.src diff --git a/conf/nginx.conf b/conf/nginx.conf index 9eff7cb..312a59d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -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; - } } diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index d07fc7d..b4c5f33 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -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 diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index a7d4e66..188abf6 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,6 +1,7 @@ ## Configuration - * Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH. +* 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 diff --git a/manifest.json b/manifest.json index 0fb14d6..8621e8b 100644 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "mysql" ], "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "arguments": { "install": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 4dd6f6b..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -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 #================================================= diff --git a/scripts/install b/scripts/install index 29af62e..d3b1eaf 100644 --- a/scripts/install +++ b/scripts/install @@ -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 diff --git a/scripts/upgrade b/scripts/upgrade index 867c172..03e870e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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)