From a000f270924d71c7cd02e675cf83c19a986a4b4b Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 25 Mar 2018 22:57:52 +0200
Subject: [PATCH] Remove CKAN hackfix for self-signed certificate verification

---
 ckan-datapusher/Dockerfile                             |  7 -------
 .../docker/srv/ckan-datapusher/ssl_verify.patch        | 10 ----------
 .../srv/ckan-datapusher/conf/datapusher_settings.py    |  1 -
 3 files changed, 18 deletions(-)
 delete mode 100644 ckan-datapusher/docker/srv/ckan-datapusher/ssl_verify.patch

diff --git a/ckan-datapusher/Dockerfile b/ckan-datapusher/Dockerfile
index febe4bf..464f4a9 100644
--- a/ckan-datapusher/Dockerfile
+++ b/ckan-datapusher/Dockerfile
@@ -33,13 +33,6 @@ RUN \
  && find /srv/ckan-datapusher/src -name '.git*' -exec rm -rf {} + \
  && rm -rf /root/.cache
 
-COPY docker/ /
-
-RUN \
- # Hackfix the self-signed certificate verification
- cd /usr/lib/python2.7/site-packages \
- && patch -p0 </srv/ckan-datapusher/ssl_verify.patch
-
 VOLUME ["/etc/ckan-datapusher", "/srv/ckan-datapusher/data"]
 EXPOSE 8080
 
diff --git a/ckan-datapusher/docker/srv/ckan-datapusher/ssl_verify.patch b/ckan-datapusher/docker/srv/ckan-datapusher/ssl_verify.patch
deleted file mode 100644
index 13e6039..0000000
--- a/ckan-datapusher/docker/srv/ckan-datapusher/ssl_verify.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- orig/web.py
-+++ ckanserviceprovider/web.py
-@@ -733,6 +733,7 @@
-     try:
-         result = requests.post(
-             result_url,
-+            verify=False,
-             data=json.dumps(job_dict, cls=DatetimeJsonEncoder),
-             headers=headers)
- 
diff --git a/ckan-datapusher/srv/ckan-datapusher/conf/datapusher_settings.py b/ckan-datapusher/srv/ckan-datapusher/conf/datapusher_settings.py
index 7dd9311..93d8d5f 100644
--- a/ckan-datapusher/srv/ckan-datapusher/conf/datapusher_settings.py
+++ b/ckan-datapusher/srv/ckan-datapusher/conf/datapusher_settings.py
@@ -14,7 +14,6 @@ SQLALCHEMY_DATABASE_URI = 'sqlite:////srv/ckan-datapusher/data/jobs.db'
 
 HOST = '0.0.0.0'
 PORT = 8080
-SSL_VERIFY = False
 
 FROM_EMAIL = 'ckan@spotter.ngo'