Merge branch 'jenkins-build-28' into 'master'
Auto-merge for build 28 See merge request puppet/puppet_cd!24
This commit is contained in:
@@ -208,7 +208,7 @@ class puppet_cd::r10k::webhook (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# create service config
|
# create service config
|
||||||
file { $pt_r10k_hook_config_file:
|
file { $pt_r10k_hook_service_file:
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
@@ -223,7 +223,7 @@ class puppet_cd::r10k::webhook (
|
|||||||
service { 'r10k-webhook':
|
service { 'r10k-webhook':
|
||||||
ensure => 'running',
|
ensure => 'running',
|
||||||
enable => true,
|
enable => true,
|
||||||
subscribe => File[$pt_r10k_hook_config_file],
|
subscribe => File[$pt_r10k_hook_service_file],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class puppet_cd::r10k::webhook (
|
|||||||
}
|
}
|
||||||
|
|
||||||
# create service config
|
# create service config
|
||||||
file { $pt_r10k_hook_config_file:
|
file { $pt_r10k_hook_service_file:
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
@@ -60,7 +60,7 @@ class puppet_cd::r10k::webhook (
|
|||||||
service { 'r10k-webhook':
|
service { 'r10k-webhook':
|
||||||
ensure => 'running',
|
ensure => 'running',
|
||||||
enable => true,
|
enable => true,
|
||||||
subscribe => File[$pt_r10k_hook_config_file],
|
subscribe => File[$pt_r10k_hook_service_file],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user