Merge branch 'jenkins-build-5' into 'master'
Auto-merge for build 5 See merge request puppet/confdroid_automatic!4
This commit is contained in:
@@ -273,10 +273,10 @@
|
|||||||
<span class='name'>ac_email_to</span>
|
<span class='name'>ac_email_to</span>
|
||||||
|
|
||||||
|
|
||||||
<span class='type'>(<tt>Array[String]</tt>)</span>
|
<span class='type'>(<tt>String</tt>)</span>
|
||||||
|
|
||||||
|
|
||||||
<em class="default">(defaults to: <tt>['root@example.net','ops@example.net']</tt>)</em>
|
<em class="default">(defaults to: <tt>'root@example.net'</tt>)</em>
|
||||||
|
|
||||||
|
|
||||||
—
|
—
|
||||||
@@ -365,7 +365,7 @@ class confdroid_automatic::params (
|
|||||||
String $ac_apply_updates = 'yes',
|
String $ac_apply_updates = 'yes',
|
||||||
String $ac_reboot = 'never',
|
String $ac_reboot = 'never',
|
||||||
String $ac_emit_via = 'email',
|
String $ac_emit_via = 'email',
|
||||||
Array[String] $ac_email_to = ['root@example.net','ops@example.net'],
|
String $ac_email_to = 'root@example.net',
|
||||||
String $ac_email_host = 'localhost',
|
String $ac_email_host = 'localhost',
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
# @param [String] ac_apply_updates whether to apply available updates
|
# @param [String] ac_apply_updates whether to apply available updates
|
||||||
# @param [String] ac_reboot when to reboot after applied updates
|
# @param [String] ac_reboot when to reboot after applied updates
|
||||||
# @param [String] ac_emit_via how to inform about emitted updates
|
# @param [String] ac_emit_via how to inform about emitted updates
|
||||||
# @param [Array[String]] ac_email_to where to send the email to
|
# @param [String] ac_email_to where to send the email to
|
||||||
# @param [String] ac_email_host which host to use to send the email
|
# @param [String] ac_email_host which host to use to send the email
|
||||||
##############################################################################
|
##############################################################################
|
||||||
class confdroid_automatic::params (
|
class confdroid_automatic::params (
|
||||||
@@ -28,7 +28,7 @@ class confdroid_automatic::params (
|
|||||||
String $ac_apply_updates = 'yes',
|
String $ac_apply_updates = 'yes',
|
||||||
String $ac_reboot = 'never',
|
String $ac_reboot = 'never',
|
||||||
String $ac_emit_via = 'email',
|
String $ac_emit_via = 'email',
|
||||||
Array[String] $ac_email_to = ['root@example.net','ops@example.net'],
|
String $ac_email_to = 'root@example.net',
|
||||||
String $ac_email_host = 'localhost',
|
String $ac_email_host = 'localhost',
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|||||||
Reference in New Issue
Block a user