Update to 2021-01-06 18:00

master
Daniel Berteaud 4 years ago
parent cdbba4a28c
commit 351c5a89c0
  1. 1
      roles/grafana/tasks/main.yml
  2. 4
      roles/httpd_common/tasks/main.yml
  3. 11
      roles/httpd_common/templates/logrotate.conf.j2
  4. 2
      roles/nginx/templates/logrotate.conf.j2
  5. 3
      roles/squid/files/acl/software_various.domains

@ -36,6 +36,7 @@
- import_tasks: ../includes/get_rand_pass.yml - import_tasks: ../includes/get_rand_pass.yml
vars: vars:
- pass_file: /etc/grafana/ansible_db_pass - pass_file: /etc/grafana/ansible_db_pass
- complex: False
- set_fact: grafana_db_pass={{ rand_pass }} - set_fact: grafana_db_pass={{ rand_pass }}
tags: grafana tags: grafana

@ -112,6 +112,10 @@
notify: reload httpd notify: reload httpd
tags: [conf,web] tags: [conf,web]
- name: Configure log rotation
template: src=logrotate.conf.j2 dest=/etc/logrotate.d/httpd
tags: [conf,web]
- name: Remove old iptables rule - name: Remove old iptables rule
iptables_raw: iptables_raw:
name: httpd_port name: httpd_port

@ -0,0 +1,11 @@
/var/log/httpd/*log {
daily
rotate 60
missingok
notifempty
compress
sharedscripts
postrotate
/bin/systemctl reload httpd.service > /dev/null 2>/dev/null || true
endscript
}

@ -1,7 +1,7 @@
/var/log/nginx/*log { /var/log/nginx/*log {
create 0644 nginx nginx create 0644 nginx nginx
daily daily
rotate 10 rotate 60
missingok missingok
notifempty notifempty
compress compress

@ -47,6 +47,9 @@ forge.glpi-project.org
# Chrome on Linux # Chrome on Linux
dl.google.com/linux/chrome dl.google.com/linux/chrome
# Hosts several things, including the Zabbix datasource for Grafana
storage.googleapis.com
# Grafana repo # Grafana repo
grafanarel.s3.amazonaws.com grafanarel.s3.amazonaws.com
packages.grafana.com packages.grafana.com

Loading…
Cancel
Save