diff --git a/README.md b/README.md index 6580ab703861867af452061b8bf2009c015c2733..30e4b99d8218f4c0c7746b5e2537163072890311 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,6 @@ Details in `REFERENCE.md`. This module is tested with following OSes : * Ubuntu 16.04 * Debian 8, 9 - * CentOS 7 Known bugs are listed in `CHANGELOG.md` file. @@ -265,6 +264,9 @@ Even if module should work with Puppet4, Puppet 4 is end of life since 2019-01-0 So tests with Puppet 4 are removed. Acceptance tests are done with last available release 5 and 6. +PHP shiped with CentOS 7 is version 5.4. WordPress 5.2 requires at least 5.6.20. +So, CentOS7 is removed from acceptance tests and from the list of compatible OSes. + ## Development Home at URL https://gitlab.adullact.net/adullact/puppet-wordpress diff --git a/metadata.json b/metadata.json index b158267e44e4af90525369f1953fe6cc272ea36d..bc92f060e3942f0b2e98e7c87066759d1a6c7063 100644 --- a/metadata.json +++ b/metadata.json @@ -47,4 +47,4 @@ "pdk-version": "1.9.1", "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git", "template-ref": "1.9.1-0-g6945d31" -} \ No newline at end of file +} diff --git a/templates/external_fact_wordpress.rb.erb b/templates/external_fact_wordpress.rb.erb index 9a3471b9e5ac9d800e6d16577bbe9d67a5a88cfc..c6cebe1bf53c6602b01293cbccf513d30aec8307 100755 --- a/templates/external_fact_wordpress.rb.erb +++ b/templates/external_fact_wordpress.rb.erb @@ -68,7 +68,7 @@ for site in wproot.keys Open3.popen3('wp','--allow-root','--format=csv',"--path=#{path}",'--fields=language,status,update','--status=active','language','core','list') do |stdin, stdout, stderr, wait_thr| if wait_thr.value.success? while line = stdout.gets - langcode, langstatus, langupdate = line.match(/^([\w_]+),([\w]+),([\w]+)/).captures + langcode, langstatus, langupdate = line.match(/^([\w_]+),(["\w ]+),(["\w ]+)/).captures lang_hash = {} if langcode != 'language' @@ -90,7 +90,7 @@ for site in wproot.keys Open3.popen3('wp','--allow-root','--format=csv',"--path=#{path}",'plugin','list') do |stdin, stdout, stderr, wait_thr| if wait_thr.value.success? while line = stdout.gets - pluginname, pluginstatus, pluginupdate, pluginversion = line.match(/^([\w\d-]+),([\w\d]+),([\w\d]+),([\w\d\.]+)/).captures + pluginname, pluginstatus, pluginupdate, pluginversion = line.match(/^([\w\d-]+),(["\w\d ]+),(["\w\d ]+),(["\w\d\. ]+)/).captures plugin_hash = {} if pluginname != 'name' @@ -112,7 +112,7 @@ for site in wproot.keys Open3.popen3('wp','--allow-root','--format=csv',"--path=#{path}",'theme','list') do |stdin, stdout, stderr, wait_thr| if wait_thr.value.success? while line = stdout.gets - themename, themestatus, themeupdate, themeversion = line.match(/^([\w\d-]+),([\w\d]+),([\w\d]+),([\w\d\.]+)/).captures + themename, themestatus, themeupdate, themeversion = line.match(/^([\w\d-]+),(["\w\d ]+),(["\w\d ]+),(["\w\d\. ]+)/).captures theme_hash = {} if themename != 'name'