Revert "add CloudFront app distribution support for the Dokku stack"

This reverts commit a26c081.

Author: tobiasmcnulty

stack/__init__.py

@@ -23,8 +23,8 @@
 else:  # USE_GOVCLOUD and USE_EC2 both provide EC2 instances
     from . import instances  # noqa: F401
 
-# only non-GovCloud can have a CDN for the app server
-if os.environ.get('USE_GOVCLOUD') != 'on':
+# only non-GovCloud stacks with a load balancer can have a CDN for the app server
+if os.environ.get('USE_GOVCLOUD') != 'on' and os.environ.get('USE_DOKKU') != 'on':
     from . import cdn  # noqa: F401
 
 print(template.template.to_json())

stack/cdn.py

@@ -29,15 +29,15 @@
 from .template import template
 
 if os.getenv('USE_EB') == 'on':
-    # if we're using EB, use the EB endpoint URL
     origin_domain_name = GetAtt("EBEnvironment", "EndpointURL")
-elif os.getenv('USE_DOKKU') == 'on':
-    # if we're using Dokku, point the CloudFront distribution to the Elastic IP
-    origin_domain_name = Ref("Eip")
-else:
-    # otherwise, use the load balancer DNS name
+elif os.getenv('USE_DOKKU') != 'on':
+    # only import load_balancer if it's needed (not supported by Dokku stack yet)
     from .load_balancer import load_balancer
     origin_domain_name = GetAtt(load_balancer, "DNSName")
+else:
+    origin_domain_name = None
+    app_distribution = None
+    app_uses_cloudfront_condition = None
 
 if origin_domain_name:
     app_uses_cloudfront = template.add_parameter(

stack/environment.py

@@ -34,8 +34,12 @@
 else:
     es_domain = None
 
-if os.getenv('USE_GOVCLOUD') != 'on':
-    # GovCloud doesn't support CloudFront
+
+if os.getenv('USE_GOVCLOUD') != 'on' and os.getenv('USE_EB') != 'on':
+    # GovCloud doesn't support CloudFront, and with Elastic Beanstalk
+    # attempting to add an environment variable pointing to to the distrubtion
+    # creates a circular dependency (because it's not possible to create the
+    # EB load balancer separately from the EB application itself)
     from .cdn import app_distribution, app_uses_cloudfront_condition
 else:
     app_distribution = None