fix validation regular expressions
This commit is contained in:
parent
426af2b656
commit
d25044f6c7
2 changed files with 6 additions and 6 deletions
|
@ -39,7 +39,7 @@ class puppetdb(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Validate node_ttl
|
# Validate node_ttl
|
||||||
validate_re ($node_ttl_real, ['^(\d)+[s,m,d]$'], "node_ttl is <${node_ttl}> which does not match the regex validation")
|
validate_re ($node_ttl_real, ['^\d+(d|h|m|s|ms)$'], "node_ttl is <${node_ttl}> which does not match the regex validation")
|
||||||
|
|
||||||
# Apply necessary suffix if zero is specified.
|
# Apply necessary suffix if zero is specified.
|
||||||
if $node_purge_ttl == '0' {
|
if $node_purge_ttl == '0' {
|
||||||
|
@ -49,7 +49,7 @@ class puppetdb(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Validate node_purge_ttl
|
# Validate node_purge_ttl
|
||||||
validate_re ($node_purge_ttl_real, ['^(\d)+[s,m,d]$'], "node_purge_ttl is <${node_purge_ttl}> which does not match the regex validation")
|
validate_re ($node_purge_ttl_real, ['^\d+(d|h|m|s|ms)$'], "node_purge_ttl is <${node_purge_ttl}> which does not match the regex validation")
|
||||||
|
|
||||||
# Apply necessary suffix if zero is specified.
|
# Apply necessary suffix if zero is specified.
|
||||||
if $report_ttl == '0' {
|
if $report_ttl == '0' {
|
||||||
|
@ -59,7 +59,7 @@ class puppetdb(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Validate report_ttl
|
# Validate report_ttl
|
||||||
validate_re ($report_ttl_real, ['^(\d)+[s,m,d]$'], "report_ttl is <${report_ttl}> which does not match the regex validation")
|
validate_re ($report_ttl_real, ['^\d+(d|h|m|s|ms)$'], "report_ttl is <${report_ttl}> which does not match the regex validation")
|
||||||
|
|
||||||
# Validate puppetdb_service_status
|
# Validate puppetdb_service_status
|
||||||
if !($puppetdb_service_status in ['true', 'running', 'false', 'stopped']) {
|
if !($puppetdb_service_status in ['true', 'running', 'false', 'stopped']) {
|
||||||
|
|
|
@ -38,7 +38,7 @@ class puppetdb::server(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Validate node_ttl
|
# Validate node_ttl
|
||||||
validate_re ($node_ttl_real, ['^(\d)+[s,m,d]$'], "node_ttl is <${node_ttl}> which does not match the regex validation")
|
validate_re ($node_ttl_real, ['^\d+(d|h|m|s|ms)$'], "node_ttl is <${node_ttl}> which does not match the regex validation")
|
||||||
|
|
||||||
# Apply necessary suffix if zero is specified.
|
# Apply necessary suffix if zero is specified.
|
||||||
if $node_purge_ttl == '0' {
|
if $node_purge_ttl == '0' {
|
||||||
|
@ -48,7 +48,7 @@ class puppetdb::server(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Validate node_purge_ttl
|
# Validate node_purge_ttl
|
||||||
validate_re ($node_purge_ttl_real, ['^(\d)+[s,m,d]$'], "node_purge_ttl is <${node_purge_ttl}> which does not match the regex validation")
|
validate_re ($node_purge_ttl_real, ['^\d+(d|h|m|s|ms)$'], "node_purge_ttl is <${node_purge_ttl}> which does not match the regex validation")
|
||||||
|
|
||||||
# Apply necessary suffix if zero is specified.
|
# Apply necessary suffix if zero is specified.
|
||||||
if $report_ttl == '0' {
|
if $report_ttl == '0' {
|
||||||
|
@ -58,7 +58,7 @@ class puppetdb::server(
|
||||||
}
|
}
|
||||||
|
|
||||||
# Validate report_ttl
|
# Validate report_ttl
|
||||||
validate_re ($report_ttl_real, ['^(\d)+[s,m,d]$'], "report_ttl is <${report_ttl}> which does not match the regex validation")
|
validate_re ($report_ttl_real, ['^\d+(d|h|m|s|ms)$'], "report_ttl is <${report_ttl}> which does not match the regex validation")
|
||||||
|
|
||||||
# Validate puppetdb_service_status
|
# Validate puppetdb_service_status
|
||||||
if !($puppetdb_service_status in ['true', 'running', 'false', 'stopped']) {
|
if !($puppetdb_service_status in ['true', 'running', 'false', 'stopped']) {
|
||||||
|
|
Loading…
Reference in a new issue