Skip to content
Snippets Groups Projects
Commit f9bb0cfd authored by Jörg Sachse's avatar Jörg Sachse
Browse files

resolve merge conflict

parents eb3c29b7 b874ac8a
No related branches found
No related tags found
No related merge requests found
Pipeline #2955 failed
---
- name: logrotate für daemon log konfigurieren
template:
src: "etc/logrotate.d/repair_daemon.j2"
dest: "/etc/logrotate.d/repair_daemon"
owner: "root"
group: "root"
mode: "0400"
\ No newline at end of file
......@@ -53,7 +53,7 @@
# https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s09.html
- name: find checkit_tiff configs
ansible.builtin.find:
paths: "/usr/share/checkit_tiff_strict/example_configs/"
paths: "/usr/share/checkit_tiff_upcoming/example_configs/"
patterns: '*.cfg'
register: cit_configs
- name: install checkit_tiff config
......@@ -84,8 +84,8 @@
owner: "{{ vault_service_user }}"
group: "{{ vault_service_user }}"
loop:
- src: "/usr/bin/checkit_tiff_strict"
dest: "/home/{{ vault_service_user }}/.config/repair/bin/checkit_tiff"
- src: "/usr/bin/checkit_tiff_upcoming"
dest: "/home/{{ vault_service_user }}/.config/repair/bin/checkit_tiff" # HINT: repairtool searches for 'checkit_tiff' binary, not 'checkit_tiff_upcoming'
- src: "/usr/bin/fixit_tiff"
dest: "/home/{{ vault_service_user }}/.config/repair/bin/fixit_tiff"
- src: "/usr/local/etc/cit_tiff6_baseline_SLUB.cfg"
......
......@@ -23,6 +23,11 @@
ansible.builtin.import_tasks: "configure-nfs-mounts.yml"
tags: [nfs]
### CONFIG LOGROTATE
- name: config logrotate
import_tasks: configure-logrotate.yml
tags: [log]
### INSTALLATION REPARATURTOOLS ###
- name: install repairtools
ansible.builtin.import_tasks: "install-repair-tools.yml"
......
/var/log/repair/sdvlzarepair/repair_daemon.log {
daily
rotate 9999
create 644 root root
missingok
notifempty
compress
delaycompress
}
......@@ -3,7 +3,7 @@ Description=Repair Tool Daemon (DiGAS)
After=network.target
[Service]
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_digas/unprocessed/ --targetdir=/mnt/lza_repair_digas/processed/ --logdir=/mnt/lza_repair_digas/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_digas.crashmail }}" --daemonname="Repair-Daemon-DiGAS" --workers 5
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_digas/unprocessed/ --targetdir=/mnt/lza_repair_digas/processed/ --logdir=/mnt/lza_repair_digas/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_digas.crashmail }}" --daemonname="Repair-Daemon-DiGAS" --workers 2
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
......
......@@ -3,7 +3,7 @@ Description=Repair Tool Daemon (Fotothek)
After=network.target
[Service]
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_fotothek/unprocessed/ --targetdir=/mnt/lza_repair_fotothek/processed/ --logdir=/mnt/lza_repair_fotothek/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_fotothek.crashmail }}" --daemonname="Repair-Daemon-Fotothek" --workers 5
ExecStart=/usr/bin/perl -I/usr/lib/perl5 /usr/bin/repair_daemon.pl --sourcedir=/mnt/lza_repair_fotothek/unprocessed/ --targetdir=/mnt/lza_repair_fotothek/processed/ --logdir=/mnt/lza_repair_fotothek/log/ --minwait=65 --minfileage=65 --crashmail="{{ vault_service_files.repair_daemon_fotothek.crashmail }}" --daemonname="Repair-Daemon-Fotothek" --workers 2 --citcfg="{{ vault_service_files.repair_daemon_fotothek.citcfg }}"
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
......
---
tool_versions:
- package_name: "checkit-tiff-strict"
version: "1.3.1"
- package_name: "checkit-tiff-upcoming"
version: "1.4.1"
- package_name: "fixit-tiff"
version: "1.3.3"
version: "1.3.4"
- package_name: "libtiff-tools"
version: "4.2.0-1+deb11u1"
- package_name: "libslub-lza-repair-perl"
version: "0.9.18-1"
version: "0.9.25-1"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment