Explorar o código

repalce ynh_install_extra_app_dependencies by apt extras.couchdb.repo

Chris Vogel hai 1 ano
pai
achega
1406e05519
Modificáronse 2 ficheiros con 11 adicións e 4 borrados
  1. 4 0
      manifest.toml
  2. 7 4
      scripts/install

+ 4 - 0
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]
 

+ 7 - 4
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