Skip to content

Commit c7c9fbf

Browse files
authored
Merge pull request voxpupuli#201 from traylenator/fsckuser
Run cvmfs_fsck service as user cvmfs
2 parents ff3399d + 0ad920f commit c7c9fbf

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

spec/classes/fsck_spec.rb

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,15 @@
2828
it { is_expected.not_to contain_cron('clean_quarantaine') }
2929
it { is_expected.not_to contain_cron('cvmfs_fsck') }
3030
it { is_expected.to contain_systemd__tmpfile('cvmfs-quarantaine.conf').with_ensure('absent') }
31-
it { is_expected.to contain_systemd__timer('cvmfs-fsck.timer').with_service_content(%r{^ExecStart=/usr/bin/cvmfs_fsck /var/lib/cvmfs/shared$}) }
32-
it { is_expected.to contain_systemd__timer('cvmfs-fsck.timer').with_service_content(%r{^ConditionPathExists=/var/lib/cvmfs/shared/txn$}) }
33-
it { is_expected.to contain_systemd__timer('cvmfs-fsck.timer').with_timer_content(%r{^OnUnitActiveSec=1week$}) }
34-
it { is_expected.to contain_systemd__timer('cvmfs-fsck.timer').without_timer_content(%r{^OnBootSec$}) }
31+
32+
it {
33+
is_expected.to contain_systemd__timer('cvmfs-fsck.timer').
34+
with_service_content(%r{^ExecStart=/usr/bin/cvmfs_fsck /var/lib/cvmfs/shared$}).
35+
with_service_content(%r{^ConditionPathExists=/var/lib/cvmfs/shared/txn$}).
36+
with_service_content(%r{^User=cvmfs$}).
37+
with_timer_content(%r{^OnUnitActiveSec=1week$}).
38+
without_timer_content(%r{^OnBootSec$})
39+
}
3540
end
3641
end
3742

templates/fsck/cvmfs-fsck.service.epp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ConditionPathExists=<%= $cache_base %>/shared/txn
1010

1111
[Service]
1212
Type=oneshot
13+
User=cvmfs
1314
Nice=19
1415
IOSchedulingClass=2
1516
IOSchedulingPriority=7

0 commit comments

Comments
 (0)