Remove couchapp dependency

scottishgovernment · Jan 15, 2021 · a85dd60 · a85dd60
1 parent efdd9e5
commit a85dd60
Show file tree

Hide file tree

Showing 7 changed files with 1,227 additions and 50 deletions.
diff --git a/couch-rpz/.couchapprc b/couch-rpz/.couchapprc
diff --git a/couch-rpz/push b/couch-rpz/push
@@ -5,7 +5,7 @@ dir="$(dirname $0)"
 if [ "$dir" != . ]; then
   cd "$dir"
 fi
-remote=$(jq -r .env.default.db < .couchapprc)
+remote=http://localhost:5984/rpz
 couchdb_user=${housing_data_couchdb_user-${couchdb_user-}}
 couchdb_password=${housing_data_couchdb_password-${couchdb_password-}}
 if [ -n "$couchdb_user" ] && [ -n "$couchdb_password" ]; then
@@ -14,9 +14,9 @@ if [ -n "$couchdb_user" ] && [ -n "$couchdb_password" ]; then
   remote="${proto}://${couchdb_user}:${couchdb_password}@${rest}"
 fi
 echo "Updating design document."
-couchapp push --docid _design/rpz "$remote"
+../node_modules/.bin/couchdb-push "$remote" .
 echo "Updating security document."
-curl \
+curl -sSf \
   -X PUT \
   -H 'Content-Type: application/json' \
   -d '{}' \

diff --git a/couch/.couchapprc b/couch/.couchapprc
diff --git a/couch/push b/couch/push
@@ -5,7 +5,7 @@ dir="$(dirname $0)"
 if [ "$dir" != . ]; then
   cd "$dir"
 fi
-remote=$(jq -r .env.default.db < .couchapprc)
+remote=http://localhost:5984/ons
 couchdb_user=${housing_data_couchdb_user-${couchdb_user-}}
 couchdb_password=${housing_data_couchdb_password-${couchdb_password-}}
 if [ -n "$couchdb_user" ] && [ -n "$couchdb_password" ]; then
@@ -14,9 +14,9 @@ if [ -n "$couchdb_user" ] && [ -n "$couchdb_password" ]; then
   remote="${proto}://${couchdb_user}:${couchdb_password}@${rest}"
 fi
 echo "Updating design document."
-couchapp push --docid _design/ons "$remote"
+../node_modules/.bin/couchdb-push "$remote" .
 echo "Updating security document."
-curl \
+curl -sSf \
   -X PUT \
   -H 'Content-Type: application/json' \
   -d '{}' \

diff --git a/debian/control b/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.4
 
 Package: housing-data
 Architecture: all
-Depends: ${misc:Depends}, couchapp
+Depends: ${misc:Depends}
 Description: Housing data