websites fix directive errorDocument
This commit is contained in:
parent
b0f0755275
commit
df443719ab
|
@ -47,6 +47,7 @@ class Apache2Controller(ServiceController):
|
||||||
extra_conf += self.get_redirects(directives)
|
extra_conf += self.get_redirects(directives)
|
||||||
extra_conf += self.get_proxies(directives)
|
extra_conf += self.get_proxies(directives)
|
||||||
extra_conf += self.get_saas(directives)
|
extra_conf += self.get_saas(directives)
|
||||||
|
extra_conf += self.get_errordocuments(directives)
|
||||||
settings_context = site.get_settings_context()
|
settings_context = site.get_settings_context()
|
||||||
for location, directive in settings.WEBSITES_VHOST_EXTRA_DIRECTIVES:
|
for location, directive in settings.WEBSITES_VHOST_EXTRA_DIRECTIVES:
|
||||||
extra_conf.append((location, directive % settings_context))
|
extra_conf.append((location, directive % settings_context))
|
||||||
|
@ -343,6 +344,18 @@ class Apache2Controller(ServiceController):
|
||||||
)
|
)
|
||||||
return redirects
|
return redirects
|
||||||
|
|
||||||
|
|
||||||
|
def get_errordocuments(self, directives):
|
||||||
|
errordocuments = []
|
||||||
|
for erdocument in directives.get('error-document', []):
|
||||||
|
code, target = erdocument.split(" ", 1)
|
||||||
|
erdocument = "ErrorDocument %s %s" % (code, target)
|
||||||
|
errordocuments.append(
|
||||||
|
(code, erdocument)
|
||||||
|
)
|
||||||
|
return errordocuments
|
||||||
|
|
||||||
|
|
||||||
def get_proxies(self, directives):
|
def get_proxies(self, directives):
|
||||||
proxies = []
|
proxies = []
|
||||||
for proxy in directives.get('proxy', []):
|
for proxy in directives.get('proxy', []):
|
||||||
|
|
Loading…
Reference in a new issue