From 376e7cb787f4bcc24634e97f373127815882b1e4 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:17:47 +0100 Subject: [PATCH] Testing (#55) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Version 2 (#32) * v2 * Auto-update README * v2 * fix * Auto-update README --------- Co-authored-by: yunohost-bot * Update _common.sh * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml Co-authored-by: Alexandre Aubin * Upgrade to v2023.08.13 (#37) * Upgrade to v2023.08.13 * Auto-update README * Update manifest.toml * Update tests.toml * Update manifest.toml * Auto-update README * Upgrade to v2023.08.17 (#39) * Upgrade to v2023.08.17 * Auto-update README * Update manifest.toml * Upgrade to v2023.08.19 (#41) * Upgrade to v2023.08.19 * Auto-update README * Upgrade to v2023.08.21 (#42) * Upgrade to v2023.08.21 * Auto-update README * Upgrade to v2023.08.24 (#43) * Upgrade to v2023.08.24 * Auto-update README * Upgrade to v2023.09.05 (#45) * Upgrade to v2023.09.05 * Auto-update README * Cleaning (#49) * cleaning * Auto-update README * cleaning * Auto-update README --------- Co-authored-by: yunohost-bot * Upgrade to v2023.10.11 (#50) * Upgrade to v2023.10.11 * Auto-update README * Upgrade to v2023.10.27 (#52) * Upgrade to v2023.11.07 (#53) * Upgrade to v2023.11.07 * Auto-update README * cleaning * Update manifest.toml * Auto-update README * cleaning * Upgrade to v2023.12.01 (#56) * Upgrade to v2023.12.01 * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin Co-authored-by: YunoHost Bot Co-authored-by: Félix Piédallu --- README.md | 6 +++--- README_fr.md | 4 ++-- manifest.toml | 9 ++++++--- scripts/install | 4 ++-- scripts/upgrade | 15 ++------------- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 10dd4eb..0769a72 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Cachet is a status page for your API, service or company. Built with all of the features that you'd expect from a status page, Cachet comes with a powerful API, a metric system, multiple user support, two factor authentication for added security and is easy to get setup. A powerful, self-hosted alternative to StatusPage.io and Status.io. -**Shipped version:** 2023.11.07~ynh1 +**Shipped version:** 2023.12.01~ynh1 **Demo:** https://demo.cachethq.io @@ -47,4 +47,4 @@ or sudo yunohost app upgrade cachet -u https://github.com/YunoHost-Apps/cachet_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 7642b41..68d6c40 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Cachet est une page de statut pour votre API, service ou entreprise. Construit avec toutes les fonctionnalités que vous attendez d'une page de status, Cachet est livré avec une API puissante, un système métrique, une prise en charge de plusieurs utilisateurs, une authentification à deux facteurs pour une sécurité accrue et est facile à configurer. Une alternative puissante et auto-hébergée à StatusPage.io et Status.io. -**Version incluse :** 2023.11.07~ynh1 +**Version incluse :** 2023.12.01~ynh1 **Démo :** https://demo.cachethq.io diff --git a/manifest.toml b/manifest.toml index a032628..ee5f120 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Cachet" description.en = "Open source status page system" description.fr = "Système de page de statut open source" -version = "2023.11.07~ynh1" +version = "2023.12.01~ynh1" maintainers = ["JimboJoe"] @@ -22,8 +22,11 @@ code = "https://github.com/CachetHQ/Cachet" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -52,8 +55,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/CachetHQ/Cachet/archive/91e4d8aba7ce425c0b27ec74de2bc4792b3a107b.tar.gz" - sha256 = "d0c50aa8754b9e9ac2b7b26d086953fe698a7b7957b28df0209783a87485a21f" + url = "https://github.com/CachetHQ/Cachet/archive/8b565ab7f05ce8b89a40e61330a7e0ac2bf55630.tar.gz" + sha256 = "1385a972e2733f0da38ee186c853d470de1bc95532996d52106135685ef35b0f" autoupdate.strategy = "latest_github_commit" [resources.system_user] diff --git a/scripts/install b/scripts/install index 9ef3e26..81c8865 100644 --- a/scripts/install +++ b/scripts/install @@ -44,7 +44,7 @@ ynh_add_fpm_config #================================================= ynh_script_progression --message="Pre-configuring Cachet..." --weight=10 -ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" #================================================= # INSTALL AND INITIALIZE COMPOSER @@ -71,7 +71,7 @@ password_hash="$(cd $install_dir ; php$phpversion artisan tinker -q --no-ansi password_pash="${password_hash::-1}" # Remove last character # Populate MySQL database -ynh_add_config --template="../conf/init-mysql.sql" --destination="$install_dir/init-mysql.sql" +ynh_add_config --template="init-mysql.sql" --destination="$install_dir/init-mysql.sql" ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < "$install_dir/init-mysql.sql" ynh_delete_file_checksum --file="$install_dir/init-mysql.sql" #REMOVEME? ynh_secure_remove --file="$install_dir/init-mysql.sql" diff --git a/scripts/upgrade b/scripts/upgrade index 4df9deb..cf7b033 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # SET MAINTENANCE MODE ON #================================================= @@ -25,14 +19,9 @@ exec_artisan "down" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -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=".env bootstrap/cachet/production.php" -fi +ynh_setup_source --dest_dir="$install_dir" --keep=".env bootstrap/cachet/production.php" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"