Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ansible_lza_repair
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Digital Preservation
ansible_lza_repair
Commits
32858d8d
Commit
32858d8d
authored
1 year ago
by
Jörg Sachse
Browse files
Options
Downloads
Patches
Plain Diff
fix:
#1
parent
bc287d1e
No related branches found
No related tags found
1 merge request
!4
Resolve "wrong use of systemd templates for validation cleanup service"
Pipeline
#4516
failed
1 year ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tasks/install_validation_tools.yml
+22
-15
22 additions, 15 deletions
tasks/install_validation_tools.yml
templates/usr/local/lib/systemd/system/cleanup_daemon_@.timer.j2
+1
-1
1 addition, 1 deletion
...es/usr/local/lib/systemd/system/cleanup_daemon_@.timer.j2
with
23 additions
and
16 deletions
tasks/install_validation_tools.yml
+
22
−
15
View file @
32858d8d
...
...
@@ -51,25 +51,22 @@
# we place them below "/usr/" instead of "/etc/".
-
name
:
create symlinks for validation tool profiles
ansible.builtin.file
:
src
:
"
{{
item.s
}}"
# file to link to
src
:
"
{{
item.s
|
default(omit)
}}"
# file to link to
dest
:
"
/usr/local/etc/{{
item.d
}}"
# symlink file path
state
:
"
{{
item.state
|
default('link')
}}"
loop
:
# TIFF 6
-
s
:
"
/usr/share/checkit_tiff_current/example_configs/cit_tiff6_baseline_SLUB.cfg"
d
:
"
cit_tiff6_baseline_SLUB_current.cfg"
-
d
:
"
cit_tiff6_baseline_SLUB_current.cfg"
state
:
"
absent"
-
s
:
"
/usr/share/checkit_tiff_upcoming/example_configs/cit_tiff6_baseline_SLUB.cfg"
d
:
"
cit_tiff6_baseline_SLUB_upcoming.cfg"
# GeoTIFF 6
-
s
:
"
/usr/share/checkit_tiff_current/example_configs/cit_tiff6_geotiff_SLUB.cfg"
d
:
"
cit_tiff6_geotiff_SLUB_current.cfg"
-
d
:
"
cit_tiff6_geotiff_SLUB_current.cfg"
state
:
"
absent"
-
s
:
"
/usr/share/checkit_tiff_upcoming/example_configs/cit_tiff6_geotiff_SLUB.cfg"
d
:
"
cit_tiff6_geotiff_SLUB_upcoming.cfg"
# Retrofotos Fotothek
-
s
:
"
/usr/share/checkit_tiff_current/example_configs/cit_tiff_retrofotos_SLUB.cfg"
d
:
"
cit_tiff_retrofotos_SLUB_current.cfg"
-
d
:
"
cit_tiff_retrofotos_SLUB_current.cfg"
state
:
"
absent"
-
s
:
"
/usr/share/checkit_tiff_upcoming/example_configs/cit_tiff_retrofotos_SLUB.cfg"
d
:
"
cit_tiff_retrofotos_SLUB_upcoming.cfg"
...
...
@@ -124,7 +121,7 @@
group
:
"
root"
loop
:
-
"
cleanup_daemon_@.service"
-
"
cleanup_daemon.timer"
-
"
cleanup_daemon
_@
.timer"
-
"
validation_daemon_any@.service"
-
"
validation_daemon_any.socket"
-
"
validation_daemon_@.service"
# Daemon service
...
...
@@ -146,18 +143,28 @@
-
name
:
enable & start cleanup daemon
ansible.builtin.systemd
:
unit
:
"
{{
item.u
}}"
unit
:
"
cleanup_daemon_@
{{
item.u
}}"
daemon_reload
:
true
enabled
:
true
state
:
"
{{
item.s
|
default(omit)
}}"
# this can never be idempotent
loop
:
-
u
:
"
cleanup_daemon.timer"
# Timers...
-
u
:
"
ddz.timer"
s
:
"
restarted"
-
u
:
"
cleanup_daemon_@ddz.service"
-
u
:
"
cleanup_daemon_@digas.service"
-
u
:
"
cleanup_daemon_@fotothek.service"
-
u
:
"
cleanup_daemon_@mediathek.service"
-
u
:
"
cleanup_daemon_@save.service"
-
u
:
"
digas.timer"
s
:
"
restarted"
-
u
:
"
fotothek.timer"
s
:
"
restarted"
-
u
:
"
mediathek.timer"
s
:
"
restarted"
-
u
:
"
save.timer"
s
:
"
restarted"
# ... and their respective services
-
u
:
"
ddz.service"
-
u
:
"
digas.service"
-
u
:
"
fotothek.service"
-
u
:
"
mediathek.service"
-
u
:
"
save.service"
changed_when
:
false
-
name
:
enable & start validation Webservice
...
...
This diff is collapsed.
Click to expand it.
templates/usr/local/lib/systemd/system/cleanup_daemon.timer.j2
→
templates/usr/local/lib/systemd/system/cleanup_daemon
_@
.timer.j2
+
1
−
1
View file @
32858d8d
...
...
@@ -2,7 +2,7 @@
Description=Cleanup Daemon for Validation Tool (%i)
[Timer]
Unit=cleanup_daemon_@.service
Unit=cleanup_daemon_@
%i
.service
Persistent=true
OnCalendar=daily
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment