Merge pull request #85 from dmcanally/Line540-regex

davejrt · web-flow · commit 3a117f871ca0 · 2017-12-20T11:43:07.000+11:00
Adding \. to regex on init.pp:540 to address issue #84
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -537,7 +537,7 @@
     validate_string($tls_key)
   }
 
-  if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.]\d(~|-)ce|1.\d+)/ ) {
+  if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.]\d(~|-|\.)ce|1.\d+)/ ) {
     if ( $docker_ee) {
       validate_string($docker::docker_ee_source_location)
       validate_string($docker::docker_ee_key_source)

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@`
`537`	`537`	`validate_string($tls_key)`
`538`	`538`	`}`
`539`	`539`
`540`		`- if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.]\d(~\|-)ce\|1.\d+)/ ) {`
	`540`	`+ if ( $version == undef ) or ( $version !~ /^(17[.]0[0-5][.]\d(~\|-\|\.)ce\|1.\d+)/ ) {`
`541`	`541`	`if ( $docker_ee) {`
`542`	`542`	`validate_string($docker::docker_ee_source_location)`
`543`	`543`	`validate_string($docker::docker_ee_key_source)`