Merge pull request #13 from YunoHost-Apps/testing

Testing
2024-09-03 19:36:04 +02:00 · 2024-01-13 14:02:22 +01:00 · 2024-01-13 14:02:22 +01:00 · 3a019ffe7c
commit 3a019ffe7c
parent f75ff8932c 4301233c7c
7 changed files with 28 additions and 28 deletions
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 Leantime is a lean open source project management system for startups and innovators. It's an alternative to ClickUp, Notion, and Asana.

-**Shipped version:** 2.3.25~ynh1
+**Shipped version:** 2.4.8~ynh1

 ## Screenshots

--- a/README_fr.md
+++ b/README_fr.md
@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po

 Leantime est un système de gestion de projet open source allégé pour les startups et les innovateurs. C'est une alternative à ClickUp, Notion et Asana.

-**Version incluse :** 2.3.25~ynh1
+**Version incluse :** 2.4.8~ynh1

 ## Captures d’écran

--- a/conf/.env
+++ b/conf/.env
@ -52,19 +52,19 @@ LEAN_S3_FOLDER_NAME = ''                           # Foldername within S3 (can b
 LEAN_S3_END_POINT = null                           # S3 EndPoint S3 Compatible (https://sfo2.digitaloceanspaces.com)

 ## Email
-LEAN_EMAIL_RETURN = ''                             # Return email address, needs to be valid email address format
-LEAN_EMAIL_USE_SMTP = false                        # Use SMTP? If set to false, the default php mail() function will be used
+LEAN_EMAIL_RETURN = '__APP__@__DOMAIN__'          # Return email address, needs to be valid email address format
+LEAN_EMAIL_USE_SMTP = true                         # Use SMTP? If set to false, the default php mail() function will be used
 LEAN_EMAIL_SMTP_HOSTS = 'localhost'                # SMTP host
 LEAN_EMAIL_SMTP_AUTH = true                        # SMTP authentication required
-LEAN_EMAIL_SMTP_USERNAME = ''                      # SMTP username
-LEAN_EMAIL_SMTP_PASSWORD = ''                      # SMTP password
+LEAN_EMAIL_SMTP_USERNAME = '__APP__'               # SMTP username
+LEAN_EMAIL_SMTP_PASSWORD = '__MAIL_PWD__'          # SMTP password
 LEAN_EMAIL_SMTP_AUTO_TLS = true                    # SMTP Enable TLS encryption automatically if a server supports it
 LEAN_EMAIL_SMTP_SECURE = ''                        # SMTP Security protocol (usually one of: TLS, SSL, STARTTLS)
-LEAN_EMAIL_SMTP_SSLNOVERIFY = false                # SMTP Allow insecure SSL: Don't verify certificate, accept self-signed, etc.
+LEAN_EMAIL_SMTP_SSLNOVERIFY = true                 # SMTP Allow insecure SSL: Don't verify certificate, accept self-signed, etc.
 LEAN_EMAIL_SMTP_PORT = '25'                        # Port (usually one of 25, 465, 587, 2526)

 ## Ldap
-LEAN_LDAP_USE_LDAP = false                         # Set to true if you want to use LDAP
+LEAN_LDAP_USE_LDAP = true                          # Set to true if you want to use LDAP
 LEAN_LDAP_LDAP_TYPE = 'OL'                         # Select the correct directory type. Currently Supported: OL - OpenLdap, AD - Active Directory
 LEAN_LDAP_HOST = '127.0.0.1'                       # FQDN
 LEAN_LDAP_PORT = 389                               # Default Port
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "Leantime"
 description.en = "Project management system for startups and innovators"
 description.fr = "Système de gestion de projet pour les startups et les innovateurs"

-version = "2.3.25~ynh1"
+version = "2.4.8~ynh1"

 maintainers = ["eric_G"]

@ -16,11 +16,14 @@ admindoc = "https://docs.leantime.io"
 code = "https://github.com/Leantime/leantime"

 [integration]
-yunohost = ">= 11.1.21"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
-ldap = false
+
+ldap = true
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@ -45,17 +48,22 @@ ram.runtime = "50M"
    [resources.sources]

        [resources.sources.main]
-        url = "https://github.com/Leantime/leantime/releases/download/v2.3.25/Leantime-v2.3.25.zip"
-        sha256 = "aa42487659ace89bfa884226cf8a9070e2f1f45777edf726731760523fa903c3"
+        url = "https://github.com/Leantime/leantime/releases/download/v2.4.8/Leantime-v2.4.8.zip"
+        sha256 = "dd555aa5b5d55797507f282fc42162d0fbb5dab2eb825b7721063c404f6ebb0c"
        autoupdate.strategy = "latest_github_release"
-        autoupdate.asset = "Leantime-v*.zip"
+        autoupdate.asset = "Leantime-v.*.zip"

    [resources.system_user]
+    allow_email = true

    [resources.install_dir]

    [resources.permissions]
    main.url = "/"
+    api.url = "/api"
+    api.allowed = "visitors"
+    api.auth_header =false
+    api.show_tile = false

    [resources.apt]
    packages = "mariadb-server, php8.2-mysql, php8.2-mbstring, php8.2-xml, php8.2-curl, php8.2-gd, php8.2-imagick, php8.2-ldap"
--- a/scripts/change_url
+++ b/scripts/change_url
@ -9,9 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-timezone="$(cat /etc/timezone)"
-key=$(ynh_string_random --length=18)
-
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
@ -24,10 +21,7 @@ ynh_change_url_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1

-ynh_add_config --template="../conf/.env" --destination="$install_dir/config/.env"
-
-chmod 400 "$install_dir/config/.env"
-chown $app:$app "$install_dir/config/.env"
+ynh_replace_string --match_string="LEAN_APP_URL = 'https://$old_domain'" --replace_string="LEAN_APP_URL = 'https://$new_domain'" --target_file="$install_dir/config/.env"

 #=================================================
 # END OF SCRIPT
--- a/scripts/install
+++ b/scripts/install
@ -19,9 +19,9 @@ key=$(ynh_string_random --length=18)
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=1

-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"

+chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

 #=================================================
@ -29,10 +29,8 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Adding system configurations related to $app..." --weight=1

-# Create a dedicated PHP-FPM config using the conf/php-fpm.conf or conf/extra_php-fpm.conf
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config

-# Create a dedicated NGINX config using the conf/nginx.conf template
 ynh_add_nginx_config

 #=================================================
@ -42,7 +40,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1

-ynh_add_config --template="../conf/.env" --destination="$install_dir/config/.env"
+ynh_add_config --template=".env" --destination="$install_dir/config/.env"

 chmod 400 "$install_dir/config/.env"
 chown $app:$app "$install_dir/config/.env"
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -21,10 +21,10 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1

-	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir" --keep="config/.env"
 fi

+chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

 #=================================================
@ -32,7 +32,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1

-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config

 ynh_add_nginx_config