Merge pull request #43 from YunoHost-Apps/testing

Testing add-email

README.md

@@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
 No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
 
 
-**Shipped version:** 0.7.25~ynh1
+**Shipped version:** 0.7.25~ynh2
 
 ## Screenshots
 

README_fr.md

@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 FitTrackee vous permet de suivre vos activités de plein air (séances d'entraînement) à partir de fichiers gpx et de conserver vos données sur votre propre serveur.
 Aucune application mobile n'a encore été développée, mais plusieurs applications mobiles existantes peuvent stocker localement les données des séances d'entraînement et les exporter dans un fichier gpx.
 
-**Version incluse :** 0.7.25~ynh1
+**Version incluse :** 0.7.25~ynh2
 
 ## Captures d’écran
 

conf/.env.production

@@ -23,9 +23,9 @@ REDIS_URL=redis://127.0.0.1:6379/__REDIS_DB__
 # API_RATE_LIMITS="300 per 5 minutes"
 
 # Emails
-# UI_URL=__DOMAIN__
+UI_URL=__DOMAIN__
-# EMAIL_URL=
+EMAIL_URL=smtp://__APP__:__MAIL_PWD__@__DOMAIN__:587/?tls=True
-# SENDER_EMAIL=
+SENDER_EMAIL=__APP__@__DOMAIN__
 # WORKERS_PROCESSES=
 
 # Workouts

conf/fittrackee.service

@@ -29,13 +29,7 @@ Environment="STATICMAP_SUBDOMAINS="
 Environment="MAP_ATTRIBUTION="
 Environment="WEATHER_API_KEY="
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=__INSTALL_DIR__/venv/bin/gunicorn -b 127.0.0.1:__PORT__ "fittrackee:create_app()" --error-logfile /var/log/__APP__/gunicorn.log
+ExecStart=__INSTALL_DIR__/venv/bin/gunicorn -b 127.0.0.1:__PORT__ "fittrackee:create_app()" --error-logfile /var/log/__APP__/__APP__.log
-
-
-
-
-
-
 
 
 # Denying access to capabilities that should not be relevant for webapps

config_panel.toml

@@ -44,4 +44,20 @@ services = ["__APP__", "__APP___workers"]
         help.fr = "Insérer la clé api donnée par le fournisseur météo choisi"
         bind = "WEATHER_API_KEY:/var/www/__APP__/.env"
 
-   
+        [main.config.email_url]
+        ask.en = "Change SMTP mail address"
+        ask.fr = "Changer l’adresse courriel SMTP"
+        type = "string"
+        help.en = "Has to be like this: smtp://username:password@example.com:587/?tls=True. ❗ Please backup your original credentials for the case you want to reset it. "
+        help.fr = "Doit avoir la forme suivante : smtp://username:password@example.com:587/?tls=True. ❗ Veuillez sauvegarder vos coordonnées initiales au cas où vous voudriez les réinitialiser."
+        bind = "email_url:/var/www/__APP__/.env"
+
+        [main.config.sender_email]
+        ask.en = "Change sender email"
+        ask.fr = "Changer l’adresse courriel d’envoi"
+        type = "email"
+        bind = "sender_email:/var/www/__APP__/.env"
+
+               
+
+   

doc/ADMIN.md

@@ -4,7 +4,7 @@ If you have to use the [command line interface (cli)](https://samr1.github.io/Fi
 
 ```
  pushd $install_dir/
-    pipenv shell
+    source $install_dir/venv/bin/activate
     ftcli [OPTIONS] COMMAND [ARGS]...
 ```
 

doc/ADMIN_fr.md

@@ -4,7 +4,7 @@ Si vous avez besoin d’utiliser la [ligne de commande](https://samr1.github.io/
 
 ```
  pushd $install_dir/
-    pipenv shell
+    source $install_dir/venv/bin/activate
     ftcli [OPTIONS] COMMAND [ARGS]...
 ```
 

doc/PRE_UPGRADE.d/0.7.25~ynh2.md

@@ -0,0 +1,13 @@
+Great news!
+Since latest Yunohost version 11.2.5, it’s now possible for FitTrackee to send mails 🥳
+
+By default, your mail credentials are automatically set with the __DOMAIN__ where your installed FitTrackee.
+You can change it in the config_panel (but be sure to save the initial data, in case you want revert your changes).
+
+NB: `nohost.me`/`noho.st`/`ynh.fr` domains are special domains handled by Yunohost. If you installed FitTrackee on a subdomain such as fittrackee.mydomain.nohost.me, emails will be blocked. You will have either to:
+    1. install FitTrackee on a "real" domain; or
+    2. change your mail credentials in the config_panel.
+
+Don’t hesitate to raise an issue on the [forum](https://forum.yunohost.org/t/fittrackee-self-hosted-outdoor-activity-tracker/24141) or on [Github](https://github.com/YunoHost-Apps/fittrackee_ynh).
+
+Enjoy this app and thanks to @SamR1 for creating it!

manifest.toml

@@ -5,7 +5,7 @@ name = "FitTrackee"
 description.en = "Self-hosted outdoor activity tracker 🚴"
 description.fr = "Traqueur d’activités extérieures auto-hébergé 🚴"
 
-version = "0.7.25~ynh1"
+version = "0.7.25~ynh2"
 
 maintainers = ["Thovi98"]
 
@@ -17,7 +17,7 @@ admindoc = "https://samr1.github.io/FitTrackee"
 code = "https://github.com/SamR1/FitTrackee"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.5"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -63,6 +63,7 @@ ram.runtime = "50M"
 
   [resources]
     [resources.system_user]
+    allow_email = true
 
     [resources.install_dir]
 

scripts/install

@@ -20,7 +20,6 @@ ynh_script_progression --message="Configuring logrotate to manage application lo
 ynh_use_logrotate --specific_user=$app
 touch /var/log/$app/$app.log
 touch /var/log/$app/${app}_workers.log
-touch /var/log/$app/gunicorn.log
 chown -R $app:www-data /var/log/$app/
 
 #=================================================
@@ -108,16 +107,13 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers
 # INTEGRATE SERVICE IN YUNOHOST
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-
-
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

scripts/restore

@@ -23,7 +23,6 @@ ynh_script_progression --message="Configuring logrotate to manage application lo
 ynh_use_logrotate --specific_user=$app
 touch /var/log/$app/$app.log
 touch /var/log/$app/${app}_workers.log
-touch /var/log/$app/gunicorn.log
 chown -R $app:www-data /var/log/$app/
 
 #=================================================
@@ -67,7 +66,7 @@ systemctl enable "${app}_workers.service" --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 #=================================================

scripts/upgrade

@@ -114,7 +114,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 #=================================================

tests.toml

@@ -20,4 +20,5 @@ test_format = 1.0
     test_upgrade_from.9c094f9.name = "0.7.21"
     test_upgrade_from.e49294c.name = "0.7.22"
     test_upgrade_from.a446e8c.name = "0.7.23"
-    test_upgrade_from.316dea4.name = "0.7.24"
+    test_upgrade_from.316dea4.name = "0.7.24"
+    test_upgrade_from.ea68daf.name = "0.7.25~ynh1"