Merge pull request #18 from YunoHost-Apps/testing

Testing

README.md

@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Metabase is the easy, open-source way for everyone in your company to ask questions and learn from data.
 
-**Shipped version:** 0.44.6~ynh1
+**Shipped version:** 0.47.0~ynh1
 
 ## Screenshots
 

README_fr.md

@@ -16,9 +16,9 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Metabase is the easy, open-source way for everyone in your company to ask questions and learn from data.
+La métabase est le moyen facile et open source pour tous les membres de votre entreprise de poser des questions et d'apprendre à partir des données.
 
-**Version incluse :** 0.44.6~ynh1
+**Version incluse :** 0.47.0~ynh1
 
 ## Captures d’écran
 

doc/DESCRIPTION_fr.md

@@ -0,0 +1 @@
+La métabase est le moyen facile et open source pour tous les membres de votre entreprise de poser des questions et d'apprendre à partir des données.

manifest.toml

@@ -5,7 +5,7 @@ name = "Metabase"
 description.en = "Web database management tool"
 description.fr = "Outil web de gestion des bases de données"
 
-version = "0.44.6~ynh1"
+version = "0.47.0~ynh1"
 
 maintainers = ["Colin Maudry"]
 
@@ -16,7 +16,7 @@ admindoc = "https://www.metabase.com/docs/latest/"
 code = "https://github.com/metabase/metabase"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
 ldap = false
@@ -28,7 +28,6 @@ ram.runtime = "50M"
 [install]
     [install.domain]
     type = "domain"
-    full_domain = true
 
     [install.init_main_permission]
     help.en = "If enabled, Metabase will be accessible by people who do not have an account. This can be changed later via the webadmin."
@@ -38,8 +37,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://downloads.metabase.com/v0.46.3/metabase.jar"
+        url = "https://downloads.metabase.com/v0.47.0/metabase.jar"
-        sha256 = "5988d34062484b664e89ba152d8949498b3d8d9a3c51f40ce2ac7938058cd164"
+        sha256 = "9bf03a464163971196bec306590041e8f571f24e1d5a34695363f0dea1eba809"
         extract = false
         rename = "metabase.jar"
 

scripts/install

@@ -29,13 +29,13 @@ ynh_script_progression --message="Configuring NGNX web server..." --weight=3
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
-
 ynh_add_systemd_config
 
+# Use logrotate to manage application logfile(s)
+ynh_use_logrotate
+
+yunohost service add $app --description="Web database management tool" --log="/var/log/$app/$app.log"
+
 #=================================================
 # SETUP CONFIG
 #=================================================
@@ -47,23 +47,6 @@ ynh_add_config --template="../conf/metabase" --destination="/etc/default/$app"
 chmod 640 "/etc/default/$app"
 chown $app "/etc/default/$app"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SETUP LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=1
-
-# Use logrotate to manage application logfile(s)
-ynh_use_logrotate
-
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
-
-yunohost service add $app --description="Web database management tool" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

scripts/upgrade

@@ -48,26 +48,11 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=3
-
 ynh_add_systemd_config
 
-#=================================================
-# HANDLE LOG FILES AND LOGROTATE
-#=================================================
-ynh_script_progression --message="Configuring log rotation..." --weight=3
-
 # Setup logrotate
 ynh_use_logrotate
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=3
-
 yunohost service add $app --description="Web database management tool" --log="/var/log/$app/$app.log"
 
 #=================================================