From 1406e05519878a0b1b6cd679dddcb473ca3700f1 Mon Sep 17 00:00:00 2001 From: Chris Vogel Date: Fri, 19 Apr 2024 13:04:53 +0200 Subject: [PATCH] repalce ynh_install_extra_app_dependencies by apt extras.couchdb.repo --- manifest.toml | 4 ++++ scripts/install | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index a0cdd6d..0210157 100644 --- a/manifest.toml +++ b/manifest.toml @@ -165,6 +165,10 @@ ram.runtime = "100M" [resources.apt] # python dependencies shall be installed in a venv using pip. packages = "python3-pip python3-full curl apt-transport-https gnupg" + # repo for couchdb + extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main" + extras.couchdb.key = "https://couchdb.apache.org/repo/keys.asc" + extras.couchdb.packages = ["couchdb"] [antifeatures] diff --git a/scripts/install b/scripts/install index 881ad44..978ebb0 100755 --- a/scripts/install +++ b/scripts/install @@ -41,10 +41,13 @@ couchdb couchdb/adminpass_again password $password_couchdb_admin couchdb couchdb/adminpass_again seen true" | debconf-set-selections DEBIAN_FRONTEND=noninteractive # apt-get install -y --force-yes couchdb -ynh_install_extra_app_dependencies \ - --repo="deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main" \ - --key="https://couchdb.apache.org/repo/keys.asc" \ - --package="couchdb" +# ynh_install_extra_app_dependencies \ +# --repo="deb https://apache.jfrog.io/artifactory/couchdb-deb/ $(lsb_release -c -s) main" \ +# --key="https://couchdb.apache.org/repo/keys.asc" \ +# --package="couchdb" +# +# replaced by: +ynh_package_install couchdb # add couchdb configuration ynh_script_progression --message="Adding a configuration file..." --weight=2