Przeglądaj źródła

back to working version for main

I'll continue on branch testing...
Chris Vogel 1 rok temu
rodzic
commit
408f7de403
2 zmienionych plików z 9 dodań i 13 usunięć
  1. 5 6
      manifest.toml
  2. 4 7
      scripts/install

+ 5 - 6
manifest.toml

@@ -157,12 +157,11 @@ 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/ __YNH_DEBIAN_VERSION__ main"
-#    extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ bullseye main"
-    extras.couchdb.key = "https://couchdb.apache.org/repo/keys.asc"
-    extras.couchdb.packages = ["couchdb"]
-    extras.couchdb.name = "couchdb"
+    # repo for couchdb - doesn't work, yet
+    # extras.couchdb.repo = "deb https://apache.jfrog.io/artifactory/couchdb-deb/ __YNH_DEBIAN_VERSION__ main"
+    # extras.couchdb.key = "https://couchdb.apache.org/repo/keys.asc"
+    # extras.couchdb.packages = ["couchdb"]
+    # extras.couchdb.name = "couchdb"
 
 [antifeatures]
 

+ 4 - 7
scripts/install

@@ -41,13 +41,10 @@ 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"
-#
-# replaced by:
-ynh_package_install 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"
 
 # add couchdb configuration
 ynh_script_progression --message="Adding a configuration file..." --weight=2