Merge pull request #48 from YunoHost-Apps/testing

Release 0.7.18.2~ynh3

.github/workflows/package_linter.yml

@@ -0,0 +1,41 @@
+name: YunoHost apps package linter
+
+on:
+  # Allow to manually trigger the workflow
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - testing
+  pull_request:
+  schedule:
+    - cron: '0 8 * * *'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install toml
+
+      - name: 'Clone YunoHost apps package linter'
+        run: |
+          git clone --depth=1 https://github.com/YunoHost/package_linter ~/package_linter
+
+      - name: 'Run linter'
+        run: |
+          ~/package_linter/package_linter.py . > linter_logs && cat linter_logs
+
+      - name: 'Analyze linter logs'
+        run: |
+          grep "Not even a warning\!" linter_logs
+

README.md

@@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 
 Distributed social networking service
-
+**Shipped version:** 0.7.18.2~ynh3
-**Shipped version:** 0.7.18.2~ynh2
 
 ## Screenshots
 
@@ -26,12 +25,12 @@ Distributed social networking service
 
 ## Documentation and resources
 
-* Official app website: <https://diasporafoundation.org/>
+- Official app website: <https://diasporafoundation.org/>
-* Official user documentation: <https://wiki.diasporafoundation.org/FAQ_for_users>
+- Official user documentation: <https://wiki.diasporafoundation.org/FAQ_for_users>
-* Official admin documentation: <https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers>
+- Official admin documentation: <https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers>
-* Upstream app code repository: <https://github.com/diaspora/diaspora>
+- Upstream app code repository: <https://github.com/diaspora/diaspora>
-* YunoHost Store: <https://apps.yunohost.org/app/diaspora>
+- YunoHost Store: <https://apps.yunohost.org/app/diaspora>
-* Report a bug: <https://github.com/YunoHost-Apps/diaspora_ynh/issues>
+- Report a bug: <https://github.com/YunoHost-Apps/diaspora_ynh/issues>
 
 ## Developer info
 

README_fr.md

@@ -17,8 +17,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 ## Vue d’ensemble
 
 Service de réseau social distribué
-
+**Version incluse :** 0.7.18.2~ynh3
-**Version incluse :** 0.7.18.2~ynh2
 
 ## Captures d’écran
 
@@ -26,12 +25,12 @@ Service de réseau social distribué
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://diasporafoundation.org/>
+- Site officiel de l’app : <https://diasporafoundation.org/>
-* Documentation officielle utilisateur : <https://wiki.diasporafoundation.org/FAQ_for_users>
+- Documentation officielle utilisateur : <https://wiki.diasporafoundation.org/FAQ_for_users>
-* Documentation officielle de l’admin : <https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers>
+- Documentation officielle de l’admin : <https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers>
-* Dépôt de code officiel de l’app : <https://github.com/diaspora/diaspora>
+- Dépôt de code officiel de l’app : <https://github.com/diaspora/diaspora>
-* YunoHost Store: <https://apps.yunohost.org/app/diaspora>
+- YunoHost Store : <https://apps.yunohost.org/app/diaspora>
-* Signaler un bug : <https://github.com/YunoHost-Apps/diaspora_ynh/issues>
+- Signaler un bug : <https://github.com/YunoHost-Apps/diaspora_ynh/issues>
 
 ## Informations pour les développeurs
 

conf/diaspora.yml

@@ -557,7 +557,7 @@ configuration: ## Section
 
     ## This selects which mailer should be used. Use 'smtp' for a smtp
     ## connection or 'sendmail' to use the sendmail binary.
-    method: 'sendmail'
+    method: 'smtp'
 
     ## Ignore if method isn't 'smtp'.
     smtp: ## Section
@@ -565,36 +565,39 @@ configuration: ## Section
       ## Host and port of the smtp server handling outgoing mail.
       ## This should match the common name of the certificate sent by
       ## the SMTP server, if it sends one. (default port=587)
-      #host: 'smtp.example.org'
+      # we use localhost because I don't know an easy way to determine the main domain of an ynh instance
-      #port: 587
+      # it forces us to disable certificate verification below though...
+      host: 'localhost'
+      port: 25
 
       ## Authentication required to send mail (default='plain').
       ## Use one of 'plain', 'login' or 'cram_md5'. Use 'none'
       ## if server does not support authentication.
-      #authentication: 'plain'
+      authentication: 'plain'
 
       ## Credentials to log in to the SMTP server.
       ## May be necessary if authentication is not 'none'.
-      #username: 'change_me'
+      username: '__APP__'
-      #password: 'change_me'
+      password: '__MAIL_PWD__'
 
       ## Automatically enable TLS (default=true).
       ## Leave this commented out if authentication is set to 'none'.
       #starttls_auto: true
 
       ## The domain for the HELO command, if needed.
-      #domain: 'smtp.example.org'
+      domain: '__DOMAIN__'
 
       ## OpenSSL verify mode used when connecting to a SMTP server with TLS.
       ## Set this to 'none' if you have a self-signed certificate. Possible
       ## values: 'none', 'peer'.
-      #openssl_verify_mode: 'none'
+      # We use localhost because I don't 
+      openssl_verify_mode: 'none'
 
     ## Ignore if method isn't 'sendmail'
-    sendmail: ## Section
+    # sendmail: ## Section
 
       ## The path to the sendmail binary (default='/usr/sbin/sendmail')
-      location: '/usr/sbin/sendmail'
+      # location: '/usr/sbin/sendmail'
 
       ## Use exim and sendmail (default=false)
       #exim_fix: false

conf/nginx.conf

@@ -25,7 +25,7 @@ location @diaspora {
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   proxy_set_header X-Forwarded-Proto https;
-  proxy_set_header Host $http_host;
+  proxy_set_header Host $host;
   proxy_redirect off;
 
   proxy_pass http://unix:/run/__NAME__/diaspora.sock;

manifest.toml

@@ -7,9 +7,9 @@ name = "Diaspora"
 description.en = "Distributed social networking service"
 description.fr = "Service de réseau social distribué"
 
-version = "0.7.18.2~ynh2"
+version = "0.7.18.2~ynh3"
 
-maintainers = ["rafi59"]
+maintainers = ["autra"]
 
 [upstream]
 license = "AGPL-3.0"
@@ -20,7 +20,7 @@ code = "https://github.com/diaspora/diaspora"
 
 [integration]
 yunohost = ">=11.2"
-architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"]
+architectures = "all"
 multi_instance = true
 ldap = false
 sso = false
@@ -53,6 +53,7 @@ ram.runtime = "2000M"
     autoupdate.strategy = "latest_github_release"
 
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 

tests.toml

@@ -4,6 +4,4 @@ test_format = 1.0
 
 [default]
 
-    test_upgrade_from.ee7996edba39c1978b0986aabc89042f949e335f.name = "0.7.16.0-ynh1"
+    test_upgrade_from.3a75b9a45f6ef65e8eef32ff5ba0c8d0b7ae9c8d.name = "0.7.18.2~ynh2"
-    test_upgrade_from.f6bc22257c54478420ed42480f346f25601ee87a.name = "0.7.17.0~ynh1"
-    test_upgrade_from.bcba30ecc623956f98ba0ab0b4e545ba665ffe27.name = "0.7.18.1~ynh1"