adelgado/ansible-role-nagios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix vhostname

Browse source
This commit is contained in:
Antonio J. Delgado 2022-12-08 14:00:05 +02:00
parent fb909d1a2c
commit 83ca2386b0
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -79,7 +79,7 @@ There are similar list of objects supported by Nagios like:
The list vhosts contains at least one virtual host to configure Apache2. The list vhosts contains at least one virtual host to configure Apache2.
```yaml ```yaml
- vhost_name: nagios4.example.org - vhostname: nagios4.example.org
serveradmin: webmaster@example.org serveradmin: webmaster@example.org
vhost_aliases: nagios.example.org vhost_aliases: nagios.example.org
ssl_certificate_file: "/etc/letsencrypt/live/nagios4.example.org/fullchain.pem" ssl_certificate_file: "/etc/letsencrypt/live/nagios4.example.org/fullchain.pem"

6
tasks/configure_apache.yml
View file

@ -1,7 +1,7 @@
--- ---
- name: Ensure configuration file is available to Apache - name: Ensure configuration file is available to Apache
template: template:
dest: "/etc/apache2/sites-available/25-{{ item.vhost_name }}.conf" dest: "/etc/apache2/sites-available/25-{{ item.vhostname }}.conf"
src: templates/apache_vhost.j2 src: templates/apache_vhost.j2
mode: 0644 mode: 0644
backup: yes backup: yes
@ -19,7 +19,7 @@
- name: Ensure vhost is enabled - name: Ensure vhost is enabled
file: file:
state: link state: link
src: "/etc/apache2/sites-available/25-{{ item.vhost_name }}.conf" src: "/etc/apache2/sites-available/25-{{ item.vhostname }}.conf"
path: "/etc/apache2/sites-enabled/25-{{ item.vhost_name }}.conf" path: "/etc/apache2/sites-enabled/25-{{ item.vhostname }}.conf"
loop: "{{ vhosts }}" loop: "{{ vhosts }}"
notify: Restart Apache2 notify: Restart Apache2

18
templates/apache_vhost.j2
View file

@ -1,14 +1,14 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName {{ item.vhost_name }} ServerName {{ item.vhostname }}
ServerAdmin {{ item.webadmin | default('webmaster@' + item.vhost_name) }} ServerAdmin {{ item.webadmin | default('webmaster@' + item.vhostname) }}
{% if item.vhost_aliases is defined %} {% if item.vhost_aliases is defined %}
ServerAlias {{ item.vhost_aliases }} ServerAlias {{ item.vhost_aliases }}
{% endif %} {% endif %}
## Logging ## Logging
ErrorLog "/var/log/apache2/{{ item.vhost_name }}_error_ssl.log" ErrorLog "/var/log/apache2/{{ item.vhostname }}_error_ssl.log"
ServerSignature Off ServerSignature Off
CustomLog "/var/log/apache2/{{ item.vhost_name }}_access_ssl.log" combined CustomLog "/var/log/apache2/{{ item.vhostname }}_access_ssl.log" combined
ErrorDocument 404 https://susurrando.com/notfound.php ErrorDocument 404 https://susurrando.com/notfound.php
ErrorDocument 500 https://susurrando.com/error500.php ErrorDocument 500 https://susurrando.com/error500.php
ErrorDocument 503 https://susurrando.com/error503.php ErrorDocument 503 https://susurrando.com/error503.php
@ -94,13 +94,13 @@
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>
ServerName {{ item.vhost_name }} ServerName {{ item.vhostname }}
ServerAdmin {{ item.webadmin }} ServerAdmin {{ item.webadmin }}
## Logging ## Logging
ErrorLog "/var/log/apache2/{{ item.vhost_name }}_ssl_error_ssl.log" ErrorLog "/var/log/apache2/{{ item.vhostname }}_ssl_error_ssl.log"
ServerSignature Off ServerSignature Off
CustomLog "/var/log/apache2/{{ item.vhost_name }}_ssl_access_ssl.log" combined CustomLog "/var/log/apache2/{{ item.vhostname }}_ssl_access_ssl.log" combined
ErrorDocument 404 https://susurrando.com/notfound.php ErrorDocument 404 https://susurrando.com/notfound.php
ErrorDocument 500 https://susurrando.com/error500.php ErrorDocument 500 https://susurrando.com/error500.php
ErrorDocument 503 https://susurrando.com/error503.php ErrorDocument 503 https://susurrando.com/error503.php
@ -125,6 +125,6 @@
SSLProxyEngine On SSLProxyEngine On
SSLProxyCheckPeerCN on SSLProxyCheckPeerCN on
SSLProxyCheckPeerExpire on SSLProxyCheckPeerExpire on
ProxyPass / http://{{ item.vhost_name }}/ ProxyPass / http://{{ item.vhostname }}/
ProxyPassReverse / http://{{ item.vhost_name }}/ ProxyPassReverse / http://{{ item.vhostname }}/
</VirtualHost> </VirtualHost>