Skip to content

Commit 347fd32

Browse files
committed
Add support for prerotate script (#22)
1 parent 6bb5c80 commit 347fd32

File tree

5 files changed

+30
-6
lines changed

5 files changed

+30
-6
lines changed

Diff for: README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ This example is taken from [`molecule/default/converge.yml`](https://github.com/
4242
- name: example-delaycompress
4343
path: "/var/log/example-delaycompress/*.log"
4444
delaycompress: true
45-
- name: example-script
46-
path: "/var/log/example-script/*.log"
45+
- name: example-prerotate-script
46+
path: "/var/log/example-prerotate-script/*.log"
47+
prerotate: echo "e.g. backup to an offsite location"
48+
- name: example-postrotate-script
49+
path: "/var/log/example-postrotate-script/*.log"
4750
postrotate: killall -HUP some_process_name
4851
- name: btmp
4952
path: /var/log/btmp

Diff for: molecule/default/converge.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@
2929
- name: example-delaycompress
3030
path: "/var/log/example-delaycompress/*.log"
3131
delaycompress: true
32-
- name: example-script
33-
path: "/var/log/example-script/*.log"
32+
- name: example-prerotate-script
33+
path: "/var/log/example-prerotate-script/*.log"
34+
prerotate: echo "e.g. backup to an offsite location"
35+
- name: example-postrotate-script
36+
path: "/var/log/example-postrotate-script/*.log"
3437
postrotate: killall -HUP some_process_name
3538
- name: btmp
3639
path: /var/log/btmp

Diff for: molecule/default/prepare.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
- /var/log/example-copylog
2323
- /var/log/example-copytruncate
2424
- /var/log/example-delaycompress
25-
- /var/log/example-script
25+
- /var/log/example-prerotate-script
26+
- /var/log/example-postrotate-script
2627
- /var/log/example-sharedscripts
2728
- /var/log/example-dateyesterday
2829

@@ -39,7 +40,8 @@
3940
- /var/log/example-copylog/app.log
4041
- /var/log/example-copytruncate/app.log
4142
- /var/log/example-delaycompress/app.log
42-
- /var/log/example-script/app.log
43+
- /var/log/example-prerotate-script/app.log
44+
- /var/log/example-postrotate-script/app.log
4345
- /var/log/example-sharedscripts/app.log
4446
- /var/log/example-dateyesterday/app.log
4547
- /var/log/btmp

Diff for: tasks/assert.yml

+12
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,18 @@
127127
when:
128128
- item.delaycompress is defined
129129

130+
- name: assert | Test prerotate in logrotate_entries
131+
ansible.builtin.assert:
132+
that:
133+
- item.prerotate is string
134+
- item.prerotate is not none
135+
quiet: true
136+
loop: "{{ logrotate_entries }}"
137+
loop_control:
138+
label: "{{ item.name }}"
139+
when:
140+
- item.prerotate is defined
141+
130142
- name: assert | Test postrotate in logrotate_entries
131143
ansible.builtin.assert:
132144
that:

Diff for: templates/entry.j2

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434

3535
{% if item.dateyesterday is defined and item.dateyesterday %} dateyesterday{% endif %}
3636

37+
{% if item.prerotate is defined %} prerotate
38+
{{ item.prerotate }}
39+
endscript{% endif %}
40+
3741
{% if item.postrotate is defined %} postrotate
3842
{{ item.postrotate }}
3943
endscript{% endif %}

0 commit comments

Comments
 (0)