diff --git a/README.md b/README.md index 899c95a..cfd2bfe 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d - Runtime profiling data and system monitoring reports -**Shipped version:** 9.1.2~ynh1 +**Shipped version:** 9.2.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b78dd70..26bcb37 100644 --- a/README_fr.md +++ b/README_fr.md @@ -42,7 +42,7 @@ Ce paquet peut installer la version [*Entreprise Edition*](https://docs.mattermo - Données de profilage d'exécution et rapports de surveillance du système -**Version incluse :** 9.1.2~ynh1 +**Version incluse :** 9.2.2~ynh1 ## Captures d’écran diff --git a/conf/config.json b/conf/config.json index 02a5719..3ec569c 100644 --- a/conf/config.json +++ b/conf/config.json @@ -253,12 +253,12 @@ "UseChannelInEmailNotifications": false, "RequireEmailVerification": false, "FeedbackName": "Mattermost notification", - "FeedbackEmail": "no-reply@__DOMAIN__", + "FeedbackEmail": "no-reply@__MAIN_DOMAIN__", "ReplyToAddress": "", "FeedbackOrganization": "", "EnableSMTPAuth": false, - "SMTPUsername": "mattermost", - "SMTPPassword": "__SMTP_USER_PWD__", + "SMTPUsername": "__APP__", + "SMTPPassword": "__MAIL_PWD__", "SMTPServer": "localhost", "SMTPPort": "25", "SMTPServerTimeout": 10, @@ -623,7 +623,6 @@ "PermalinkPreviews": false, "CallsEnabled": true, "NormalizeLdapDNs": false, - "GraphQL": false, "PostPriority": false, "WysiwygEditor": false, "OnboardingTourTips": true, diff --git a/manifest.toml b/manifest.toml index 4a62848..f06e3cb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Mattermost" description.en = "Open source collaboration platform built for developers" description.fr = "Plateforme de collaboration open source conçue pour les développeurs" -version = "9.1.2~ynh1" +version = "9.2.2~ynh1" maintainers = ["pmorinerie"] @@ -73,20 +73,21 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - amd64.url = "https://releases.mattermost.com/9.1.2/mattermost-team-9.1.2-linux-amd64.tar.gz" - amd64.sha256 = "d913c4709676d9a2d21b778c60ef03b81414cc7d1bf0361d82dbce74e9810d01" - arm64.url = "https://releases.mattermost.com/9.1.2/mattermost-team-9.1.2-linux-arm64.tar.gz" - arm64.sha256 = "33e47e9c246a79fa123ce6e985351fe09828d0c7b1fef88dc59b0ee04dca39f5" + amd64.url = "https://releases.mattermost.com/9.2.2/mattermost-team-9.2.2-linux-amd64.tar.gz" + amd64.sha256 = "ff42d71d8aa4189b3b8af77b5c622352d467960b19c8398c6f7d6614420ef607" + arm64.url = "https://releases.mattermost.com/9.2.2/mattermost-team-9.2.2-linux-arm64.tar.gz" + arm64.sha256 = "a2a8e40ce0b3983b19082029dcfac57a5028fd0dfac33d1221b978e8f00d90c5" armhf.url = "https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v7.5.2/mattermost-v7.5.2-linux-arm.tar.gz" armhf.sha256 = "b26a4b676ee92ac848fa2993aa67559238ba7d8c1d0e6f7ffdd79ad8fb4942f3" [resources.sources.enterprise] - amd64.url = "https://releases.mattermost.com/9.1.2/mattermost-enterprise-9.1.2-linux-amd64.tar.gz" - amd64.sha256 = "13fcdb949d613b845e028fc228f7f5ade9f452dc83fc47b4058d62d206fec3ef" - arm64.url = "https://releases.mattermost.com/9.1.2/mattermost-enterprise-9.1.2-linux-arm64.tar.gz" - arm64.sha256 = "c75860817858eddde852075ec0c0091f53cec7858be30cc7f849f31e215bd23d" + amd64.url = "https://releases.mattermost.com/9.2.2/mattermost-enterprise-9.2.2-linux-amd64.tar.gz" + amd64.sha256 = "ffa48aa925c7f2c5bbd2b62de0c9800563503ff243000d65c6ebc2261a84a132" + arm64.url = "https://releases.mattermost.com/9.2.2/mattermost-enterprise-9.2.2-linux-arm64.tar.gz" + arm64.sha256 = "8c7536c68eacc9f0b9ec034906e68a9ecb1d39d91d636d9e0c75d4a1aadf6f0e" [resources.system_user] + allow_email = true [resources.install_dir] diff --git a/scripts/_common.sh b/scripts/_common.sh index 0d8f29f..58454f3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,6 +4,11 @@ # COMMON VARIABLES #================================================= +# We want Mattermost emails to be sent from the main domain +# (the one for which the emails headers are properly configured), +# and not the subdomain or secondary domain used for Mattermost. +main_domain=$(cat /etc/yunohost/current_host) + #================================================= # PERSONAL HELPERS #=================================================