diff options
Diffstat (limited to 'ansible/roles/mox/templates/domains.conf')
| -rw-r--r-- | ansible/roles/mox/templates/domains.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/mox/templates/domains.conf b/ansible/roles/mox/templates/domains.conf index e3ef95c..2aea5b9 100644 --- a/ansible/roles/mox/templates/domains.conf +++ b/ansible/roles/mox/templates/domains.conf @@ -61,7 +61,7 @@ WebHandlers: LogName: {{ subdomain.name }}.joeac.net PathRegexp: ^/ Compress: true - Domain: {% if subdomain.name == "@" %}joeac.net{% else %}{{ subdomain.name }}.joeac.net{% endif %} + Domain: {{ subdomain.full_domain }} WebStatic: Root: {{ services[subdomain.service].root }} ListFiles: {{ "directory_listing" in services[subdomain.service] and services[subdomain.service].directory_listing }} @@ -71,7 +71,7 @@ WebHandlers: LogName: {{ subdomain.name }}.joeac.net PathRegexp: ^.*[^(.html)]$ Compress: true - Domain: {% if subdomain.name == "@" %}joeac.net{% else %}{{ subdomain.name }}.joeac.net{% endif %} + Domain: {{ subdomain.full_domain }} WebRedirect: OrigPathRegexp: ^(.*[^(.html)])$ ReplacePath: $1/index.html @@ -80,7 +80,7 @@ WebHandlers: LogName: {{ subdomain.name }}.joeac.net PathRegexp: ^/.*/index.html$ Compress: true - Domain: {% if subdomain.name == "@" %}joeac.net{% else %}{{ subdomain.name }}.joeac.net{% endif %} + Domain: {{ subdomain.full_domain }} WebRedirect: OrigPathRegexp: ^(.*)/index.html$ ReplacePath: $1.html @@ -90,7 +90,7 @@ WebHandlers: LogName: {{ subdomain.name }}.joeac.net PathRegexp: ^/ Compress: true - Domain: {% if subdomain.name == "@" %}joeac.net{% else %}{{ subdomain.name }}.joeac.net{% endif %} + Domain: {{ subdomain.full_domain }} WebForward: URL: http://{{ hostvars[services[subdomain.service].host].ansible_host }}:{{ services[subdomain.service].port }} {% endif %} |