Merge pull request #517 from Gluejar/booxtream-to-https

Booxtream to https

booxtream/__init__.py

@@ -34,7 +34,7 @@ class BooXtream(object):
             apikey = settings.BOOXTREAM_API_KEY
         if not apiuser:
             apiuser = settings.BOOXTREAM_API_USER
-        self.endpoint = 'http://service.booxtream.com/'
+        self.endpoint = 'https://service.booxtream.com/'
         self.postrequest = partial(requests.post, timeout=timeout, auth=(apiuser,apikey))
         
 

frontend/views.py

@@ -143,7 +143,6 @@ from regluit.payment.parameters import (
 )
 
 from regluit.utils.localdatetime import now, date_today
-from regluit.booxtream.exceptions import BooXtreamError
 from regluit.pyepub import InvalidEpub
 from regluit.libraryauth.views import Authenticator, superlogin, login_user
 from regluit.libraryauth.models import Library

payment/README.txt

@@ -8,8 +8,6 @@ Setup instructions for payment module
     PAYPAL_SIGNATURE = Paypal signature from developer.paypal.com
     PAYPAL_APPID = 'APP-80W284485P519543T' (for all sandbox apps), or the real APPID
 
-    BASE_URL = Set this to the server IP address that is accessible via port 80.  
-                Local IP addresses, or non-port 80 addresses will NOT work with paypal IPN.
                 
     COMPLETE_URL = relative local URL for a plege confirmation
     CANCEL_URL = relative local url for a pledge cacellation

settings/dev.py

@@ -73,7 +73,7 @@ AMAZON_FPS_HOST = "fps.sandbox.amazonaws.com"
 #AMAZON_FPS_HOST = "fps.amazonaws.com"
 
 
-BASE_URL = 'http://0.0.0.0'
+#BASE_URL = 'http://0.0.0.0'
 BASE_URL_SECURE = 'https://0.0.0.0' 
 IPN_SECURE_URL = True
 

settings/jenkins.py

@@ -55,7 +55,7 @@ SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = 'RWPnUkNieUToUtBFaXZjibsU'
 # registered to rdhye@gluejar.com on 2013.12.10
 GOOGLE_BOOKS_API_KEY = 'AIzaSyC-nBaK90PIsovMRbswPYEKgA6cJfYSDmY'
 
-BASE_URL = 'http://0.0.0.0/'
+#BASE_URL = 'http://0.0.0.0/'
 BASE_URL_SECURE = 'http://0.0.0.0/'
 IPN_SECURE_URL = False
 

settings/just.py

@@ -77,9 +77,8 @@ FREEBASE_PASSWORD = ''
 # send celery log to Python logging
 CELERYD_HIJACK_ROOT_LOGGER = False
 
-# BASE_URL is a hard-coding of the domain name for site and used for PayPal IPN
 # Next step to try https
-BASE_URL = 'http://just.unglue.it'
+#BASE_URL = 'http://just.unglue.it'
 BASE_URL_SECURE = 'https://just.unglue.it'
 IPN_SECURE_URL = False
 

settings/localvm.py

@@ -68,9 +68,8 @@ FREEBASE_PASSWORD = ''
 # send celery log to Python logging
 CELERYD_HIJACK_ROOT_LOGGER = False
 
-# BASE_URL is a hard-coding of the domain name for site and used for PayPal IPN
 # Next step to try https
-BASE_URL = 'http://127.0.0.1'
+#BASE_URL = 'http://127.0.0.1'
 BASE_URL_SECURE = 'https://127.0.0.1:443'
 IPN_SECURE_URL = False
 

settings/please.py

@@ -65,9 +65,8 @@ FREEBASE_PASSWORD = ''
 # send celery log to Python logging
 CELERYD_HIJACK_ROOT_LOGGER = False
 
-# BASE_URL is a hard-coding of the domain name for site and used for PayPal IPN
 # Next step to try https
-BASE_URL = 'http://please.unglueit.com'
+#BASE_URL = 'http://please.unglueit.com'
 BASE_URL_SECURE = 'https://please.unglueit.com'
 IPN_SECURE_URL = False
 

settings/prod.py

@@ -77,9 +77,8 @@ FREEBASE_PASSWORD = ''
 # send celery log to Python logging
 CELERYD_HIJACK_ROOT_LOGGER = False
 
-# BASE_URL is a hard-coding of the domain name for site and used for PayPal IPN
 # Next step to try https
-BASE_URL = 'http://unglue.it'
+#BASE_URL = 'http://unglue.it'
 BASE_URL_SECURE = 'https://unglue.it'
 IPN_SECURE_URL = False