Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
puppet-wordpress
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Adullact
puppet-wordpress
Commits
34269fae
Commit
34269fae
authored
5 years ago
by
Fabien Combernous
Browse files
Options
Downloads
Plain Diff
Merge branch '78-space-and-double-quote-can-be-present-in-wp-fields' into 'master'
Resolve "space and double quote can be present in wp fields" Closes
#78
See merge request
!71
parents
42af0576
0b743b00
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!71
Resolve "space and double quote can be present in wp fields"
Pipeline
#4530
failed
5 years ago
Stage: syntax
Stage: unit
Stage: acceptance
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+3
-1
3 additions, 1 deletion
README.md
metadata.json
+1
-1
1 addition, 1 deletion
metadata.json
templates/external_fact_wordpress.rb.erb
+3
-3
3 additions, 3 deletions
templates/external_fact_wordpress.rb.erb
with
7 additions
and
5 deletions
README.md
+
3
−
1
View file @
34269fae
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
metadata.json
+
1
−
1
View file @
34269fae
...
...
@@ -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
}
This diff is collapsed.
Click to expand it.
templates/external_fact_wordpress.rb.erb
+
3
−
3
View file @
34269fae
...
...
@@ -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'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment