apache/nginx: server status suffix

This commit is contained in:
Jérémy Lecour 2018-01-02 19:41:32 +01:00 committed by Jérémy Lecour
parent 08d544668b
commit b634840b42
9 changed files with 74 additions and 5 deletions

View file

@ -12,6 +12,7 @@ apache_evolinux_default_ssl_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
apache_evolinux_default_ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key apache_evolinux_default_ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key
apache_serverstatus_suffix: "" apache_serverstatus_suffix: ""
apache_serverstatus_suffix_file: "/etc/evolinux/apache_serverstatus_suffix"
apache_log2mail_include: True apache_log2mail_include: True
apache_munin_include: True apache_munin_include: True

View file

@ -46,6 +46,10 @@
tags: tags:
- apache - apache
- include: server_status.yml
tags:
- apache
- name: Copy Apache defaults config file - name: Copy Apache defaults config file
copy: copy:
src: evolinux-defaults.conf src: evolinux-defaults.conf

View file

@ -0,0 +1,29 @@
---
- name: set apache serverstatus suffix if provided
shell: "echo {{ apache_serverstatus_suffix }} > {{ apache_serverstatus_suffix_file }}"
when: apache_serverstatus_suffix != ""
- name: generate random string for server-status suffix
shell: "apg -a 1 -M N -n 1 > {{ apache_serverstatus_suffix_file }}"
args:
creates: "{{ apache_serverstatus_suffix_file }}"
- name: read apache server status suffix
command: "tail -n 1 {{ apache_serverstatus_suffix_file }}"
changed_when: False
check_mode: no
register: new_apache_serverstatus_suffix
- name: overwrite apache_serverstatus_suffix
set_fact:
apache_serverstatus_suffix: "{{ new_apache_serverstatus_suffix.stdout }}"
- debug:
var: apache_serverstatus_suffix
- name: replace server-status suffix in default site index
replace:
dest: /var/www/index.html
regexp: '__SERVERSTATUS_SUFFIX__'
replace: "{{ apache_serverstatus_suffix }}"

View file

@ -53,7 +53,7 @@
</Location> </Location>
<IfModule mod_status.c> <IfModule mod_status.c>
<Location /server-status> <Location /server-status-{{ apache_serverstatus_suffix | mandatory }}>
SetHandler server-status SetHandler server-status
include /etc/apache2/ipaddr_whitelist.conf include /etc/apache2/ipaddr_whitelist.conf
Require local Require local
@ -112,7 +112,7 @@
LogLevel warn LogLevel warn
<IfModule mod_status.c> <IfModule mod_status.c>
<Location /server-status> <Location /server-status-{{ apache_serverstatus_suffix | mandatory }}>
SetHandler server-status SetHandler server-status
include /etc/apache2/ipaddr_whitelist.conf include /etc/apache2/ipaddr_whitelist.conf
Require local Require local

View file

@ -58,7 +58,7 @@
<ul id="evolinks"> <ul id="evolinks">
<li><a href="/munin/{{ ansible_domain }}/{{ ansible_fqdn }}/">Stats système</a></li> <li><a href="/munin/{{ ansible_domain }}/{{ ansible_fqdn }}/">Stats système</a></li>
<li><a href="/server-status">Server Status</a></li> <li><a href="/server-status-__SERVERSTATUS_SUFFIX__">Server Status</a></li>
<!-- <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li> --> <!-- <li><a href="/phpmyadmin-__PHPMYADMIN_SUFFIX__/">Accès PhpMyAdmin</a></li> -->
<!-- <li><a href="/mysqlreport.html">Dernier rapport MySQL Tuner</a></li> --> <!-- <li><a href="/mysqlreport.html">Dernier rapport MySQL Tuner</a></li> -->
<!-- <li><a href="/cgi-bin/awstats.pl">Stats web</a></li> --> <!-- <li><a href="/cgi-bin/awstats.pl">Stats web</a></li> -->

View file

@ -16,4 +16,6 @@ nginx_default_redirect_url: "http://evolix.fr"
nginx_evolinux_default_enabled: True nginx_evolinux_default_enabled: True
# nginx_phpmyadmin_suffix: "" # nginx_phpmyadmin_suffix: ""
# nginx_serverstatus_suffix: ""
nginx_serverstatus_suffix: ""
nginx_serverstatus_suffix_file: "/etc/evolinux/nginx_serverstatus_suffix"

View file

@ -107,6 +107,10 @@
tags: tags:
- nginx - nginx
- include: server_status.yml
tags:
- nginx
- name: nginx vhost is installed - name: nginx vhost is installed
template: template:
src: evolinux-default.conf.j2 src: evolinux-default.conf.j2

View file

@ -0,0 +1,29 @@
---
- name: set nginx serverstatus suffix if provided
shell: "echo {{ nginx_serverstatus_suffix }} > {{ nginx_serverstatus_suffix_file }}"
when: nginx_serverstatus_suffix != ""
- name: generate random string for server-status suffix
shell: "apg -a 1 -M N -n 1 > {{ nginx_serverstatus_suffix_file }}"
args:
creates: "{{ nginx_serverstatus_suffix_file }}"
- name: read nginx server status suffix
command: "tail -n 1 {{ nginx_serverstatus_suffix_file }}"
changed_when: False
check_mode: no
register: new_nginx_serverstatus_suffix
- name: overwrite nginx_serverstatus_suffix
set_fact:
nginx_serverstatus_suffix: "{{ new_nginx_serverstatus_suffix.stdout }}"
- debug:
var: nginx_serverstatus_suffix
- name: replace server-status suffix in default site index
replace:
dest: /var/www/index.html
regexp: '__SERVERSTATUS_SUFFIX__'
replace: "{{ nginx_serverstatus_suffix }}"

View file

@ -48,7 +48,7 @@ server {
listen 80; listen 80;
server_name munin; server_name munin;
location /nginx_status { location /nginx_status-{{ nginx_serverstatus_suffix | mandatory }} {
stub_status on; stub_status on;
access_log off; access_log off;
} }