diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 0cd0c3f..0000000 --- a/manifest.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "Yourls", - "id": "yourls", - "packaging_format": 1, - "description": { - "en": "URL shortening service", - "fr": "Service de raccourcisseur d'URL" - }, - "version": "1.9.1~ynh3", - "url": "https://yourls.org/", - "upstream": { - "license": "MIT", - "website": "https://yourls.org/", - "demo": "https://yourls.org/cookie+", - "admindoc": "https://docs.yourls.org/", - "code": "https://github.com/YOURLS/YOURLS" - }, - "license": "MIT", - "maintainer": { - "name": "Anmol Sharma", - "email": "anmol@datamol.org" - }, - "previous_maintainers": { - "name": "courgette", - "email": "courgette@farcie.fr", - "url": "http://thomaslebeau.fr" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx", - "php8.0-fpm", - "mysql" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/yourls", - "default": "/yourls" - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "password", - "type": "password" - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["fr_FR", "en_US"], - "default": "fr_FR" - } - ] - } -} diff --git a/manifest.toml b/manifest.toml index 3933c9e..dec2fd9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,7 +23,7 @@ multi_instance = true ldap = false sso = false disk = "50M" -ram.build = "50M" +ram.build = "150M" ram.runtime = "50M" [install] @@ -62,6 +62,5 @@ ram.runtime = "50M" [resources.apt] packages = "mariadb-server php8.1-gmp php8.1-bcmath php8.1-curl php8.1-mysql php8.1-zip php8.1-gd php8.1-mbstring php8.1-xml" - [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 04cf7f6..f7b1f81 100644 --- a/scripts/install +++ b/scripts/install @@ -71,11 +71,6 @@ chown $app:$app "$install_dir/user/config.php" # SETUP APPLICATION WITH CURL #================================================= -# Set the app as temporarily public for curl call -ynh_script_progression --message="Configuring SSOwat..." --weight=1 -# Making the app public for curl -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" - # Installation with curl ynh_script_progression --message="Finalizing installation..." --weight=1 ynh_local_curl "admin/install.php" "install=dummy" diff --git a/tests.toml b/tests.toml index 91daf17..04464e3 100644 --- a/tests.toml +++ b/tests.toml @@ -4,4 +4,6 @@ test_format = 1.0 # ------------ # Tests to run - # ------------ \ No newline at end of file + # ------------ + + test_upgrade_from.e8cdf5c7.name = "Upgrade from 1.9.1~ynh3"