diff --git a/tasks/configure-logrotate.yml b/tasks/configure-logrotate.yml new file mode 100644 index 0000000000000000000000000000000000000000..98a79a3107c91a46775669df80a0de90ff905a6f --- /dev/null +++ b/tasks/configure-logrotate.yml @@ -0,0 +1,8 @@ +--- +- 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 diff --git a/tasks/install-repair-tools.yml b/tasks/install-repair-tools.yml index 2328f1c6602d552e57bcbda255a2fffc71a99aa4..10034088b78d6d0353425746e18a41e491670fc5 100644 --- a/tasks/install-repair-tools.yml +++ b/tasks/install-repair-tools.yml @@ -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" diff --git a/tasks/main.yml b/tasks/main.yml index 98f41050b42f310426709686d06fc62e98f39733..54e5df7048ef270e4abe971a7377563622e87d61 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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" diff --git a/templates/etc/logrotate.d/repair_daemon.j2 b/templates/etc/logrotate.d/repair_daemon.j2 new file mode 100644 index 0000000000000000000000000000000000000000..99aac631dce45497bd399a459474f2f5129c0ab2 --- /dev/null +++ b/templates/etc/logrotate.d/repair_daemon.j2 @@ -0,0 +1,9 @@ +/var/log/repair/sdvlzarepair/repair_daemon.log { + daily + rotate 9999 + create 644 root root + missingok + notifempty + compress + delaycompress +} diff --git a/templates/etc/systemd/user/repair_daemon_digas.service.j2 b/templates/etc/systemd/user/repair_daemon_digas.service.j2 index 3d12628a28933511d0b38fa9f8bbc28849595fac..63c8e8a63e8b4e19da380d125f35d87a80d1b92a 100644 --- a/templates/etc/systemd/user/repair_daemon_digas.service.j2 +++ b/templates/etc/systemd/user/repair_daemon_digas.service.j2 @@ -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 diff --git a/templates/etc/systemd/user/repair_daemon_fotothek.service.j2 b/templates/etc/systemd/user/repair_daemon_fotothek.service.j2 index 0e6534475fe73726729b312aff91ab0de6674824..d1f4e7b7c5027125667576fd08fb1d92576b24e5 100644 --- a/templates/etc/systemd/user/repair_daemon_fotothek.service.j2 +++ b/templates/etc/systemd/user/repair_daemon_fotothek.service.j2 @@ -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 diff --git a/vars/main.yml b/vars/main.yml index 3c776b0224ad41970f16118ee27c0000830864c2..2fb523b49ad81c0bcfcf738f3e8ef7f28d0ec6a7 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,10 +1,10 @@ --- 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"