s3lph/ansible-collection-webserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

render apache config with spaces instead of tabs, as the indent filter apparently doesnt support tabs...

Browse source
This commit is contained in:
s3lph 2021-04-26 02:09:22 +02:00
parent df32421381
commit 263262341a
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
roles/apache2/templates/etc/apache2/sites-available/site.conf.j2
View file

@ -3,22 +3,24 @@
{% if site.http_enabled | default(apache2_vhost_http_enabled) %} {% if site.http_enabled | default(apache2_vhost_http_enabled) %}
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin {{ site.serveradmin | default(apache2_vhost_serveradmin) }} ServerAdmin {{ site.serveradmin | default(apache2_vhost_serveradmin) }}
ServerName {{ name }} ServerName {{ name }}
{% for alias in site.aliases | default(apache2_vhost_serveraliases) %} {% for alias in site.aliases | default(apache2_vhost_serveraliases) %}
ServerAlias {{ alias }} ServerAlias {{ alias }}
{% endfor %} {% endfor %}
LogLevel {{ site.loglevel | default(apache2_vhost_loglevel) }} LogLevel {{ site.loglevel | default(apache2_vhost_loglevel) }}
ErrorLog {{ site.errorlog | default(apache2_vhost_errorlog) }} ErrorLog {{ site.errorlog | default(apache2_vhost_errorlog) }}
CustomLog {{ site.accesslog | default(apache2_vhost_accesslog) }} CustomLog {{ site.accesslog | default(apache2_vhost_accesslog) }}
{% if site.http_redirect_to_https | default(apache2_vhost_http_redirect_to_https) %} {% if site.http_redirect_to_https | default(apache2_vhost_http_redirect_to_https) %}
Redirect permanent / https://{{ name }}/ Redirect permanent / https://{{ name }}/
{% else %}
DocumentRoot {{ site.documentroot | default(apache2_vhost_documentroot) }} {% else %}
DocumentRoot {{ site.documentroot | default(apache2_vhost_documentroot) }}
{{ site.additional_config | indent(4) }}
{{ site.additional_config | indent(8) }}
{% endif %} {% endif %}
</VirtualHost> </VirtualHost>
@ -28,28 +30,28 @@
{% if site.https_enabled | default(apache2_vhost_https_enabled) %} {% if site.https_enabled | default(apache2_vhost_https_enabled) %}
<VirtualHost *:443> <VirtualHost *:443>
ServerAdmin {{ site.serveradmin | default(apache2_vhost_serveradmin) }} ServerAdmin {{ site.serveradmin | default(apache2_vhost_serveradmin) }}
ServerName {{ name }} ServerName {{ name }}
{% for alias in site.aliases | default(apache2_vhost_serveraliases) %} {% for alias in site.aliases | default(apache2_vhost_serveraliases) %}
ServerAlias {{ alias }} ServerAlias {{ alias }}
{% endfor %} {% endfor %}
LogLevel {{ site.loglevel | default(apache2_vhost_loglevel) }} LogLevel {{ site.loglevel | default(apache2_vhost_loglevel) }}
ErrorLog {{ site.errorlog | default(apache2_vhost_errorlog) }} ErrorLog {{ site.errorlog | default(apache2_vhost_errorlog) }}
CustomLog {{ site.accesslog | default(apache2_vhost_accesslog) }} CustomLog {{ site.accesslog | default(apache2_vhost_accesslog) }}
SSLEngine on SSLEngine on
{% if certfile_exists and keyfile_exists %} {% if certfile_exists and keyfile_exists %}
SSLCertificateFile {{ site.tls_certfile | default(apache2_tls_certfile) }} SSLCertificateFile {{ site.tls_certfile | default(apache2_tls_certfile) }}
SSLCertificateKeyFile {{ site.tls_keyfile | default(apache2_tls_keyfile) }} SSLCertificateKeyFile {{ site.tls_keyfile | default(apache2_tls_keyfile) }}
{% else %} {% else %}
SSLCertificateFile {{ apache2_tls_noacme_fallback_certfile }} SSLCertificateFile {{ apache2_tls_noacme_fallback_certfile }}
SSLCertificateKeyFile {{ apache2_tls_noacme_fallback_keyfile }} SSLCertificateKeyFile {{ apache2_tls_noacme_fallback_keyfile }}
{% endif %} {% endif %}
DocumentRoot {{ site.documentroot | default(apache2_vhost_documentroot) }} DocumentRoot {{ site.documentroot | default(apache2_vhost_documentroot) }}
{{ site.additional_config | indent(8) }} {{ site.additional_config | indent(4) }}
</VirtualHost> </VirtualHost>
{% endif %} {% endif %}