From ebd171f277c587aaa7730271bb48ec9a9e0e4e74 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Jul 2021 10:37:39 +0200 Subject: [PATCH] Fix --- manifest.json | 16 ++-------------- scripts/_common.sh | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/manifest.json b/manifest.json index 6d2284d..5ba3b59 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id": "invoiceninja5", "packaging_format": 1, "description": { - "en": "Create and email invoices, track payments and expenses, and time tasks" + "en": "Create and email invoices, track payments, expenses, and time tasks" }, "version": "5.2.14~ynh1", "url": "https://invoiceninja.org", @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.4-fpm", "mysql" ], "arguments": { @@ -27,29 +27,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for InvoiceNinja", - "fr": "Choisissez un nom de domaine pour InvoiceNinja" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for InvoiceNinja. Seule l'installation dans le répertoire racine est possible", - "fr": "Choisissez un chemin pour InvoiceNinja. Only installation in root is currently working" - }, "example": "/", "default": "/" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l'administrateur" - }, "example": "johndoe" }, { diff --git a/scripts/_common.sh b/scripts/_common.sh index 449a6a1..2540d9b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ YNH_PHP_VERSION="7.4" nodejs_version=12 # dependencies used by the app -pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" +#pkg_dependencies="phantomjs gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget" extra_php_dependencies="php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql"