Merge "Fix git-daemon refresh logic"
This commit is contained in:
commit
1d272b5504
|
@ -202,13 +202,13 @@ class cgit(
|
|||
content => template('cgit/git-daemon.socket.erb'),
|
||||
}
|
||||
file { 'git-daemon-init-script':
|
||||
ensure => present,
|
||||
path => '/usr/lib/systemd/system/git-daemon@.service',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
source => 'puppet:///modules/cgit/git-daemon.service',
|
||||
subscribe => File['/usr/lib/systemd/system/git-daemon.socket'],
|
||||
ensure => present,
|
||||
path => '/usr/lib/systemd/system/git-daemon@.service',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
source => 'puppet:///modules/cgit/git-daemon.service',
|
||||
require => File['/usr/lib/systemd/system/git-daemon.socket'],
|
||||
}
|
||||
} else {
|
||||
$git_daemon_service_name = 'git-daemon'
|
||||
|
|
|
@ -52,7 +52,10 @@ class cgit::selinux {
|
|||
command => "semanage port -m -t git_port_t -p tcp ${::cgit::daemon_port}",
|
||||
path => '/bin:/usr/sbin',
|
||||
before => Service[$::cgit::git_daemon_service_name],
|
||||
subscribe => File['git-daemon-init-script'],
|
||||
subscribe => [
|
||||
File['git-daemon-init-script'],
|
||||
File['/usr/lib/systemd/system/git-daemon.socket'],
|
||||
],
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue