...
|
...
|
@@ -133,7 +133,7 @@ class DistributionConfig(object):
|
133
|
133
|
## </Logging>
|
134
|
134
|
## </DistributionConfig>
|
135
|
135
|
|
136
|
|
- EMPTY_CONFIG = "<DistributionConfig><Origin/><CallerReference/><Enabled>true</Enabled></DistributionConfig>"
|
|
136
|
+ EMPTY_CONFIG = "<DistributionConfig><S3Origin><DNSName/></S3Origin><CallerReference/><Enabled>true</Enabled></DistributionConfig>"
|
137
|
137
|
xmlns = "http://cloudfront.amazonaws.com/doc/%(api_ver)s/" % { 'api_ver' : cloudfront_api_version }
|
138
|
138
|
def __init__(self, xml = None, tree = None):
|
139
|
139
|
if xml is None:
|
...
|
...
|
@@ -174,7 +174,8 @@ class DistributionConfig(object):
|
174
|
174
|
tree.attrib['xmlns'] = DistributionConfig.xmlns
|
175
|
175
|
|
176
|
176
|
## Retain the order of the following calls!
|
177
|
|
- appendXmlTextNode("Origin", self.info['Origin'], tree)
|
|
177
|
+ s3org = appendXmlTextNode("S3Origin", '', tree)
|
|
178
|
+ appendXmlTextNode("DNSName", self.info['S3Origin']['DNSName'], s3org)
|
178
|
179
|
appendXmlTextNode("CallerReference", self.info['CallerReference'], tree)
|
179
|
180
|
for cname in self.info['CNAME']:
|
180
|
181
|
appendXmlTextNode("CNAME", cname.lower(), tree)
|
...
|
...
|
@@ -322,7 +323,7 @@ class CloudFront(object):
|
322
|
322
|
def CreateDistribution(self, uri, cnames_add = [], comment = None, logging = None, default_root_object = None):
|
323
|
323
|
dist_config = DistributionConfig()
|
324
|
324
|
dist_config.info['Enabled'] = True
|
325
|
|
- dist_config.info['Origin'] = uri.host_name()
|
|
325
|
+ dist_config.info['S3Origin']['DNSName'] = uri.host_name()
|
326
|
326
|
dist_config.info['CallerReference'] = str(uri)
|
327
|
327
|
dist_config.info['DefaultRootObject'] = default_root_object
|
328
|
328
|
if comment == None:
|
...
|
...
|
@@ -687,7 +688,7 @@ class Cmd(object):
|
687
|
687
|
d = response['distribution']
|
688
|
688
|
dc = d.info['DistributionConfig']
|
689
|
689
|
output("Distribution created:")
|
690
|
|
- pretty_output("Origin", S3UriS3.httpurl_to_s3uri(dc.info['Origin']))
|
|
690
|
+ pretty_output("Origin", S3UriS3.httpurl_to_s3uri(dc.info['S3Origin']['DNSName']))
|
691
|
691
|
pretty_output("DistId", d.uri())
|
692
|
692
|
pretty_output("DomainName", d.info['DomainName'])
|
693
|
693
|
pretty_output("CNAMEs", ", ".join(dc.info['CNAME']))
|
...
|
...
|
@@ -729,7 +730,7 @@ class Cmd(object):
|
729
|
729
|
response = cf.GetDistInfo(cfuri)
|
730
|
730
|
d = response['distribution']
|
731
|
731
|
dc = d.info['DistributionConfig']
|
732
|
|
- pretty_output("Origin", S3UriS3.httpurl_to_s3uri(dc.info['Origin']))
|
|
732
|
+ pretty_output("Origin", S3UriS3.httpurl_to_s3uri(dc.info['S3Origin']['DNSName']))
|
733
|
733
|
pretty_output("DistId", d.uri())
|
734
|
734
|
pretty_output("DomainName", d.info['DomainName'])
|
735
|
735
|
pretty_output("Status", d.info['Status'])
|