Merge commit '3d4f2cdb1bd945b1f6c76c8598ae2646079b2c70'

* commit '3d4f2cdb1bd945b1f6c76c8598ae2646079b2c70': fix(presigned-url-fence): Enabling Rate Limiting again (uc-cdis#1182) chore(add pandemicresponsecommons.org to whitelist) (uc-cdis#1185)
bioteam · Apr 13, 2020 · dd81517 · dd81517
2 parents 442e044 + 3d4f2cd
commit dd81517
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/files/squid_whitelist/web_wildcard_whitelist b/files/squid_whitelist/web_wildcard_whitelist
@@ -64,3 +64,4 @@
 .virtualbox.org
 .xmission.com
 .yahooapis.com
+.pandemicresponsecommons.org
diff --git a/kube/services/presigned-url-fence/presigned-url-fence-deploy.yaml b/kube/services/presigned-url-fence/presigned-url-fence-deploy.yaml
@@ -47,7 +47,7 @@ spec:
             name: "fence-yaml-merge"
 # -----------------------------------------------------------------------------
 # DEPRECATED! Remove when all commons are no longer using local_settings.py
-#             for fence.
+#             for fence
 # -----------------------------------------------------------------------------
         - name: old-config-volume
           secret:
@@ -201,4 +201,4 @@ spec:
             echo -e "ENABLE_DB_MIGRATION: false" > "/var/www/fence/fence-config-bonus1.yaml"
             python /var/www/fence/yaml_merge.py /var/www/fence/fence-config-public.yaml /var/www/fence/fence-config-secret.yaml > /var/www/fence/fence-config-step1.yaml
             python /var/www/fence/yaml_merge.py /var/www/fence/fence-config-bonus1.yaml /var/www/fence/fence-config-step1.yaml > /var/www/fence/fence-config.yaml
-            bash /fence/dockerrun.bash && if [[ -f /dockerrun.sh ]]; then /dockerrun.sh; fi
+            bash /entrypoint.sh && /fence/dockerrun.bash && if [[ -f /dockerrun.sh ]]; then /dockerrun.sh; fi