From b634840b42a0e680d4b6ec408cd92da859391bde Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Tue, 2 Jan 2018 19:41:32 +0100 Subject: [PATCH] apache/nginx: server status suffix --- apache/defaults/main.yml | 1 + apache/tasks/main.yml | 4 +++ apache/tasks/server_status.yml | 29 +++++++++++++++++++ apache/templates/evolinux-default.conf.j2 | 4 +-- .../templates/default_www/index.html.j2 | 2 +- nginx/defaults/main.yml | 4 ++- nginx/tasks/main_regular.yml | 4 +++ nginx/tasks/server_status.yml | 29 +++++++++++++++++++ nginx/templates/evolinux-default.conf.j2 | 2 +- 9 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 apache/tasks/server_status.yml create mode 100644 nginx/tasks/server_status.yml diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml index 901f3c20..ffc74b4e 100644 --- a/apache/defaults/main.yml +++ b/apache/defaults/main.yml @@ -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_serverstatus_suffix: "" +apache_serverstatus_suffix_file: "/etc/evolinux/apache_serverstatus_suffix" apache_log2mail_include: True apache_munin_include: True diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index ab45b7ea..3175108f 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -46,6 +46,10 @@ tags: - apache +- include: server_status.yml + tags: + - apache + - name: Copy Apache defaults config file copy: src: evolinux-defaults.conf diff --git a/apache/tasks/server_status.yml b/apache/tasks/server_status.yml new file mode 100644 index 00000000..c6070c2b --- /dev/null +++ b/apache/tasks/server_status.yml @@ -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 }}" diff --git a/apache/templates/evolinux-default.conf.j2 b/apache/templates/evolinux-default.conf.j2 index 238665b2..e1c97911 100644 --- a/apache/templates/evolinux-default.conf.j2 +++ b/apache/templates/evolinux-default.conf.j2 @@ -53,7 +53,7 @@ - + SetHandler server-status include /etc/apache2/ipaddr_whitelist.conf Require local @@ -112,7 +112,7 @@ LogLevel warn - + SetHandler server-status include /etc/apache2/ipaddr_whitelist.conf Require local diff --git a/evolinux-base/templates/default_www/index.html.j2 b/evolinux-base/templates/default_www/index.html.j2 index f7d5c428..4ede9d36 100644 --- a/evolinux-base/templates/default_www/index.html.j2 +++ b/evolinux-base/templates/default_www/index.html.j2 @@ -58,7 +58,7 @@