libretic/ansible-role-apache
6
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-apache synced 2024-12-22 02:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: Allow vhosts to listen on own hosts

Browse source 
Current vhosts defenition limit them to listen only on single IP/port.
In the meanwhile, there are usecases where vhosts on the same server
might wanna listen on different quite independent set of IPs/ports,
which is not currently possible.

This patch adds such functionality, and an operator might define
extra properties for apache_vhosts to make them listening on required
ports/interfaces.
This commit is contained in:
Dmitriy Rabotyagov 2024-07-24 19:32:50 +02:00
parent 9b8f7fe7bd
commit 1b07bbd126
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
defaults/main.yml
View file

@ -18,7 +18,7 @@ apache_global_vhost_settings: |
apache_vhosts: apache_vhosts:
# Additional properties: # Additional properties:
# 'serveradmin, serveralias, allow_override, options, extra_parameters'. # 'serveradmin, serveralias, allow_override, options, extra_parameters, listen_ip, listen_port'.
- servername: "local.dev" - servername: "local.dev"
documentroot: "/var/www/html" documentroot: "/var/www/html"

4
molecule/default/converge.yml
View file

@ -10,6 +10,10 @@
apache_vhosts: apache_vhosts:
- servername: "example.com" - servername: "example.com"
documentroot: "/var/www/vhosts/example_com" documentroot: "/var/www/vhosts/example_com"
- servername: "local.example.com"
documentroot: "/var/www/vhosts/example_com"
listen_ip: 127.0.0.1
listen_port: 8080
pre_tasks: pre_tasks:
- name: Update apt cache. - name: Update apt cache.

21
templates/vhosts.conf.j2
View file

@ -1,8 +1,25 @@
{{ apache_global_vhost_settings }} {{ apache_global_vhost_settings }}
{# Set up VirtualHosts #} {# Set up VirtualHosts #}
{% set _extra_listen_list = [] %}
{% for vhost in (apache_vhosts | selectattr('listen_ip', 'defined') + apache_vhosts | selectattr('listen_port', 'defined')) | unique %}
{% set _ = _extra_listen_list.append({
'ip': vhost.listen_ip | default(apache_listen_ip),
'port': vhost.listen_port | default(apache_listen_port)
})
%}
{% endfor %}
{% for listen in _extra_listen_list | unique %}
{% if apache_vhosts_version == '2.2' %}
Listen {{ listen['port'] }}
NameVirtualHost {{ listen['ip'] }}:{{ listen['port'] }}
{% elif apache_vhosts_version == '2.4' %}
Listen {{ (listen['ip'] == '*') | ternary('', listen['ip'] + ':') }}{{ listen['port'] }}
{% endif %}
{% endfor %}
{% for vhost in apache_vhosts %} {% for vhost in apache_vhosts %}
<VirtualHost {{ apache_listen_ip }}:{{ apache_listen_port }}> <VirtualHost {{ vhost.listen_ip | default(apache_listen_ip) }}:{{ vhost.listen_port | default(apache_listen_port) }}>
ServerName {{ vhost.servername }} ServerName {{ vhost.servername }}
{% if vhost.serveralias is defined %} {% if vhost.serveralias is defined %}
ServerAlias {{ vhost.serveralias }} ServerAlias {{ vhost.serveralias }}
@ -36,7 +53,7 @@
{# Set up SSL VirtualHosts #} {# Set up SSL VirtualHosts #}
{% for vhost in apache_vhosts_ssl %} {% for vhost in apache_vhosts_ssl %}
{% if apache_ignore_missing_ssl_certificate or apache_ssl_certificates.results[loop.index0].stat.exists %} {% if apache_ignore_missing_ssl_certificate or apache_ssl_certificates.results[loop.index0].stat.exists %}
<VirtualHost {{ apache_listen_ip }}:{{ apache_listen_port_ssl }}> <VirtualHost {{ vhost.listen_ip | default(apache_listen_ip) }}:{{ vhost.listen_port_ssl | default(apache_listen_port_ssl) }}>
ServerName {{ vhost.servername }} ServerName {{ vhost.servername }}
{% if vhost.serveralias is defined %} {% if vhost.serveralias is defined %}
ServerAlias {{ vhost.serveralias }} ServerAlias {{ vhost.serveralias }}