diff --git a/README.md b/README.md index c7b945a..81f0ea2 100644 --- 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.21~ynh1 +**Shipped version:** 2.3.25~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f87feea..c613935 100644 --- 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.21~ynh1 +**Version incluse :** 2.3.25~ynh1 ## Captures d’écran diff --git a/conf/.env b/conf/.env index ac5ecf5..a6dc891 100644 --- a/conf/.env +++ b/conf/.env @@ -6,7 +6,7 @@ LEAN_APP_URL = 'https://__DOMAIN__' # Base URL, only needed for subfolder installation LEAN_APP_URL_ROOT = '__PATH__' # Base of application withotu trailing slash (used for cookies), e.g, /leantime -LEAN_DEBUG = 1 # Debug flag +LEAN_DEBUG = 0 # Debug flag # Database LEAN_DB_HOST = 'localhost' # Database host @@ -22,10 +22,10 @@ LEAN_DB_PORT = '3306' # Database port LEAN_SITENAME = 'Leantime' # Name of your site, can be changed later LEAN_LANGUAGE = '__LANGUAGE__' # Default language LEAN_DEFAULT_TIMEZONE = '__TIMEZONE__' # Set default timezone -LEAN_ENABLE_MENU_TYPE = false # Enable to specifiy menu on aproject by project basis -LEAN_SESSION_PASSWORD = '3evBlq9zdUEuzKvVJHWWx3QzsQhturBApxwcws2m' #Salting sessions. Replace with a strong password +LEAN_ENABLE_MENU_TYPE = false # Enable to specifiy menu on a project by project basis +LEAN_SESSION_PASSWORD = '__KEY__' #Salting sessions. Replace with a strong password LEAN_SESSION_EXPIRATION = 28800 # How many seconds after inactivity should we logout? 28800seconds = 8hours -LEAN_LOG_PATH = null # Default Log Path (including filename), if not set /logs/error.log will be used +LEAN_LOG_PATH = null # Default Log Path (including filename), if not set /logs/error.log will be used ## Look & Feel, these settings are available in the UI and can be overwritten there. LEAN_LOGO_PATH = '/images/logo.svg' # Default logo path, can be changed later @@ -38,8 +38,8 @@ LEAN_KEEP_THEME = true # Keep theme and language fro ## Fileuploads # Local File Uploads -LEAN_USER_FILE_PATH = '__DATA_DIR__/userfiles/' # Local relative path to store uploaded files (if not using S3) -LEAN_DB_BACKUP_PATH = '__DATA_DIR__/backupdb/' # Local relative path to store backup files, need permission to write +LEAN_USER_FILE_PATH = 'userfiles/' # Local relative path to store uploaded files (if not using S3) +LEAN_DB_BACKUP_PATH = 'backupdb/' # Local relative path to store backup files, need permission to write # S3 File Uploads LEAN_USE_S3 = false # Set to true if you want to use S3 instead of local files diff --git a/conf/php-fpm.conf b/conf/extra_php-fpm.conf similarity index 100% rename from conf/php-fpm.conf rename to conf/extra_php-fpm.conf diff --git a/doc/ADMIN.md b/doc/ADMIN.md deleted file mode 100644 index c9b5225..0000000 --- a/doc/ADMIN.md +++ /dev/null @@ -1,3 +0,0 @@ -This is a dummy admin doc for this app - -The app install dir is `__INSTALL_DIR__` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md deleted file mode 100644 index a138028..0000000 --- a/doc/ADMIN_fr.md +++ /dev/null @@ -1,3 +0,0 @@ -Ceci est une fausse doc d'admin pour cette app - -Le dossier d'install de l'app est `__INSTALL_DIR__` diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md deleted file mode 100644 index 4f57b5d..0000000 --- a/doc/POST_INSTALL.md +++ /dev/null @@ -1,6 +0,0 @@ -db username __DB_USER__ -db name __DB_NAME__ -db password __DB_PWD__ - -Navigate to __DOMAIN__/install -Follow instructions to install database and set up first user account \ No newline at end of file diff --git a/doc/screenshots/ProjectDashboard.png b/doc/screenshots/ProjectDashboard.png index 77ef096..ca4333a 100644 Binary files a/doc/screenshots/ProjectDashboard.png and b/doc/screenshots/ProjectDashboard.png differ diff --git a/manifest.toml b/manifest.toml index 0c0dcca..58abe7a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,10 +2,10 @@ packaging_format = 2 id = "leantime" 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" +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.21~ynh1" +version = "2.3.25~ynh1" maintainers = ["eric_G"] @@ -16,10 +16,10 @@ admindoc = "https://docs.leantime.io" code = "https://github.com/Leantime/leantime" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true -ldap = true +ldap = false sso = false disk = "50M" ram.build = "50M" @@ -40,31 +40,29 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["en-US", "es-ES", "it-IT", "fr-FR"] - default = "en-US" + default = "fr-FR" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/Leantime/leantime/releases/download/v2.3.21/Leantime-v2.3.21.tar.gz" - sha256 = "5a341c07322a067f9f439f826919318a3493e99b51fa6ac6d9513752f1bf3ad8" - autoupdate.strategy = "latest_github_tag" + url = "https://github.com/Leantime/leantime/releases/download/v2.3.25/Leantime-v2.3.25.zip" + sha256 = "aa42487659ace89bfa884226cf8a9070e2f1f45777edf726731760523fa903c3" + autoupdate.strategy = "latest_github_release" + autoupdate.asset = "Leantime-v*.zip" [resources.system_user] [resources.install_dir] - [resources.data_dir] - subdirs = ["userfiles", "backupdb"] - [resources.permissions] main.url = "/" [resources.apt] - packages = "mariadb-server, php8.1-mysql, php8.1-mbstring, php8.1-xml, php8.1-curl, php8.1-gd, php8.1-imagick, php8.1-ldap" + packages = "mariadb-server, php8.2-mysql, php8.2-mbstring, php8.2-xml, php8.2-curl, php8.2-gd, php8.2-imagick, php8.2-ldap" [resources.database] type = "mysql" diff --git a/scripts/backup b/scripts/backup index c6329c9..214b288 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,13 +21,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -#================================================= -# BACKUP THE DATA DIR -#================================================= - -# Only relevant if there is a "data_dir" resource for this app -ynh_backup --src_path="$data_dir" --is_big - #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= diff --git a/scripts/change_url b/scripts/change_url index 4ba8cf7..002e1f7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,6 +9,9 @@ source _common.sh source /usr/share/yunohost/helpers +timezone="$(cat /etc/timezone)" +key=$(ynh_string_random --length=18) + #================================================= # MODIFY URL IN NGINX CONF #================================================= @@ -16,6 +19,16 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config +#================================================= +# ADD A CONFIGURATION +#================================================= +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" + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index fada777..8d4db20 100755 --- a/scripts/install +++ b/scripts/install @@ -10,6 +10,7 @@ source _common.sh source /usr/share/yunohost/helpers timezone="$(cat /etc/timezone)" +key=$(ynh_string_random --length=18) #================================================= # APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) diff --git a/scripts/restore b/scripts/restore index e4c98d0..37b7897 100755 --- a/scripts/restore +++ b/scripts/restore @@ -19,16 +19,6 @@ ynh_restore_file --origin_path="$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=1 - -ynh_restore_file --origin_path="$data_dir" --not_mandatory - -# (Same as for install dir) -chown -R $app:www-data "$data_dir" - #================================================= # RESTORE THE MYSQL DATABASE #=================================================