diff --git a/README.md b/README.md index 22c0c16..b615f5c 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,6 @@ Cachet is a status page for your API, service or company. Built with all of the * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 4b82923..0e3f4d8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,6 @@ Cachet is a status page for your API, service or company. Built with all of the * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs diff --git a/manifest.toml b/manifest.toml index be45f4b..2ef8c07 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "cachet" @@ -49,10 +51,10 @@ ram.runtime = "50M" optional = true [resources] - [resources.sources.main] - url = "https://github.com/CachetHQ/Cachet/archive/2323e9c0e36100f561ba03f029d87e2543636e81.tar.gz" - sha256 = "a3e26b429e3121e728447fd26d060321b695c56aeac3fc13eb0a79d4d80c217e" - autoupdate.strategy = "latest_github_commit" + [resources.sources.main] + url = "https://github.com/CachetHQ/Cachet/archive/2323e9c0e36100f561ba03f029d87e2543636e81.tar.gz" + sha256 = "a3e26b429e3121e728447fd26d060321b695c56aeac3fc13eb0a79d4d80c217e" + autoupdate.strategy = "latest_github_commit" [resources.system_user] @@ -62,7 +64,15 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php7.4-gd php7.4-mbstring php7.4-xml php7.4-mysql php7.4-sqlite3" + packages = [ + "mariadb-server", + "php7.4", + "php7.4-gd", + "php7.4-mbstring", + "php7.4-xml", + "php7.4-mysql", + "php7.4-sqlite3" + ] [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 794c0e2..152d5c5 100644 --- a/scripts/install +++ b/scripts/install @@ -67,7 +67,7 @@ exec_artisan "cachet:install" #================================================= ynh_script_progression --message="Finalizing Cachet configuration..." -password_hash="$(cd $install_dir ; php$YNH_PHP_VERSION artisan tinker -q --no-ansi <<< "echo Hash::make('$password');" |head -n 1)" +password_hash="$(cd $install_dir ; php$phpversion artisan tinker -q --no-ansi <<< "echo Hash::make('$password');" |head -n 1)" password_pash="${password_hash::-1}" # Remove last character # Populate MySQL database