opendev
/
puppet-cgit
Code Issues Proposed changes

Merge "Fix git-daemon refresh logic"

This commit is contained in:
Jenkins 2015-10-01 18:11:11 +00:00 committed by Gerrit Code Review
parent b25d8c228d 9800f44a41
commit 1d272b5504
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@ -202,13 +202,13 @@ class cgit(
content => template('cgit/git-daemon.socket.erb'), content => template('cgit/git-daemon.socket.erb'),
} }
file { 'git-daemon-init-script': file { 'git-daemon-init-script':
ensure => present, ensure => present,
path => '/usr/lib/systemd/system/git-daemon@.service', path => '/usr/lib/systemd/system/git-daemon@.service',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
source => 'puppet:///modules/cgit/git-daemon.service', source => 'puppet:///modules/cgit/git-daemon.service',
subscribe => File['/usr/lib/systemd/system/git-daemon.socket'], require => File['/usr/lib/systemd/system/git-daemon.socket'],
} }
} else { } else {
$git_daemon_service_name = 'git-daemon' $git_daemon_service_name = 'git-daemon'

5
manifests/selinux.pp
View File

@ -52,7 +52,10 @@ class cgit::selinux {
command => "semanage port -m -t git_port_t -p tcp ${::cgit::daemon_port}", command => "semanage port -m -t git_port_t -p tcp ${::cgit::daemon_port}",
path => '/bin:/usr/sbin', path => '/bin:/usr/sbin',
before => Service[$::cgit::git_daemon_service_name], 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, refreshonly => true,
} }
} }