fix GRANT issue: GRANT USAGE to SCHEMA was missing

4 files changed, 33 insertions, 23 deletions

diff --git a/netzbon/config_nginx.sh b/netzbon/config_nginx.sh
index 224d155..3ef9f20 100755
--- a/netzbon/config_nginx.sh
+++ b/netzbon/config_nginx.sh
@@ -27,6 +27,7 @@ SITES_ENABLED_DIR=/etc/nginx/sites-enabled
 
 cat ${SITES_AVAILABLE_DIR}/taler-exchange \
   | sed -e "s/server_name localhost/server_name exchange.${DOMAIN_NAME}/g" \
+  | sed -e "s/location \/taler-exchange\//location \//g" \
   | sed -e "s/\"localhost\"/\"exchange.${DOMAIN_NAME}\"/g" \
   > ${SITES_AVAILABLE_DIR}/taler-exchange.${DOMAIN_NAME}
 rm -f ${SITES_ENABLED_DIR}/exchange.${DOMAIN_NAME}
@@ -34,6 +35,7 @@ ln -s ${SITES_AVAILABLE_DIR}/taler-exchange.${DOMAIN_NAME} ${SITES_ENABLED_DIR}/
 
 cat ${SITES_AVAILABLE_DIR}/taler-merchant \
     | sed -e "s/server_name localhost/server_name merchant.${DOMAIN_NAME}/g" \
+    | sed -e "s/location \/taler-merchant\//location \//g" \
     > ${SITES_AVAILABLE_DIR}/taler-merchant.${DOMAIN_NAME}
 rm -f ${SITES_ENABLED_DIR}/backend.${DOMAIN_NAME}
 ln -s ${SITES_AVAILABLE_DIR}/taler-merchant.${DOMAIN_NAME} ${SITES_ENABLED_DIR}/backend.${DOMAIN_NAME}
diff --git a/netzbon/setup-exchange.sh b/netzbon/setup-exchange.sh
index e8ee25f..acee51b 100755
--- a/netzbon/setup-exchange.sh
+++ b/netzbon/setup-exchange.sh
@@ -61,16 +61,24 @@ say "Setting up exchange database"
 EXCHANGE_DB=talerexchange
 # Use "|| true" to continue if these already exist.
 sudo -i -u postgres createuser -d taler-exchange-httpd || true
-sudo -i -u postgres createuser -d taler-exchange-wire || true
-sudo -i -u postgres createuser -d taler-exchange-closer || true
-sudo -i -u postgres createuser -d taler-exchange-aggregator || true
+sudo -i -u postgres createuser taler-exchange-wire || true
+sudo -i -u postgres createuser taler-exchange-closer || true
+sudo -i -u postgres createuser taler-exchange-aggregator || true
 sudo -i -u postgres createdb -O taler-exchange-httpd $EXCHANGE_DB || true
 
+echo "GRANT USAGE ON SCHEMA exchange TO \"taler-exchange-wire\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 echo "GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA exchange TO \"taler-exchange-wire\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
+echo "GRANT USAGE ON SCHEMA _v TO \"taler-exchange-wire\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 echo "GRANT SELECT ON ALL TABLES IN SCHEMA _v TO \"taler-exchange-wire\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
+
+echo "GRANT USAGE ON SCHEMA exchange TO \"taler-exchange-closer\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 echo "GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA exchange TO \"taler-exchange-closer\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
+echo "GRANT USAGE ON SCHEMA _v TO \"taler-exchange-closer\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 echo "GRANT SELECT ON ALL TABLES IN SCHEMA _v TO \"taler-exchange-closer\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
+
+echo "GRANT USAGE ON SCHEMA exchange TO \"taler-exchange-aggregator\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 echo "GRANT SELECT,INSERT,UPDATE,DELETE ON ALL TABLES IN SCHEMA exchange TO \"taler-exchange-aggregator\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
+echo "GRANT USAGE ON SCHEMA _v TO \"taler-exchange-aggregator\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 echo "GRANT SELECT ON ALL TABLES IN SCHEMA _v TO \"taler-exchange-aggregator\";" | sudo -i -u postgres psql -f - ${EXCHANGE_DB}
 
 say "Configuring exchange"
diff --git a/packaging/debian-docker/Dockerfile b/packaging/debian-docker/Dockerfile
index c2cd100..755d944 100644
--- a/packaging/debian-docker/Dockerfile
+++ b/packaging/debian-docker/Dockerfile
@@ -40,13 +40,13 @@ RUN chmod +x /root/libeufin-build.sh
 RUN /root/libeufin-build.sh v0.9.2-debian-2
 COPY taler-build.sh /root/
 RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh v0.9.2-debian-1
-#COPY sync-build.sh /root/
-#RUN chmod +x /root/sync-build.sh
-#RUN /root/sync-build.sh v0.9.2
-#COPY anastasis-build.sh /root/
-#RUN chmod +x /root/anastasis-build.sh
-#RUN /root/anastasis-build.sh v0.3.2
-#COPY wallet-build.sh /root/
-#RUN chmod +x /root/wallet-build.sh
-#RUN /root/wallet-build.sh v0.9.2-debian-1
+RUN /root/taler-build.sh v0.9.2-debian-2
+COPY sync-build.sh /root/
+RUN chmod +x /root/sync-build.sh
+RUN /root/sync-build.sh v0.9.2
+COPY anastasis-build.sh /root/
+RUN chmod +x /root/anastasis-build.sh
+RUN /root/anastasis-build.sh v0.3.2
+COPY wallet-build.sh /root/
+RUN chmod +x /root/wallet-build.sh
+RUN /root/wallet-build.sh v0.9.2-debian-2
diff --git a/packaging/ubuntu-docker/Dockerfile b/packaging/ubuntu-docker/Dockerfile
index f1b65bb..d9a746c 100644
--- a/packaging/ubuntu-docker/Dockerfile
+++ b/packaging/ubuntu-docker/Dockerfile
@@ -39,13 +39,13 @@ RUN chmod +x /root/libeufin-build.sh
 RUN /root/libeufin-build.sh v0.9.2-debian-2
 COPY taler-build.sh /root/
 RUN chmod +x /root/taler-build.sh
-RUN /root/taler-build.sh v0.9.2-debian-1
-#COPY sync-build.sh /root/
-#RUN chmod +x /root/sync-build.sh
-#RUN /root/sync-build.sh v0.9.2
-#COPY anastasis-build.sh /root/
-#RUN chmod +x /root/anastasis-build.sh
-#RUN /root/anastasis-build.sh v0.3.2
-#COPY wallet-build.sh /root/
-#RUN chmod +x /root/wallet-build.sh
-#RUN /root/wallet-build.sh v0.9.2-debian-1
+RUN /root/taler-build.sh v0.9.2-debian-2
+COPY sync-build.sh /root/
+RUN chmod +x /root/sync-build.sh
+RUN /root/sync-build.sh v0.9.2
+COPY anastasis-build.sh /root/
+RUN chmod +x /root/anastasis-build.sh
+RUN /root/anastasis-build.sh v0.3.2
+COPY wallet-build.sh /root/
+RUN chmod +x /root/wallet-build.sh
+RUN /root/wallet-build.sh v0.9.2-debian-2