Mark Bergsma has submitted this change and it was merged.
Change subject: role::cache get rid of unrecognized escape sequences
......................................................................
role::cache get rid of unrecognized escape sequences
puppet parser validate is emitting warnings on manifests/role/cache.php
because some escaped regex are in double quotes. The warning messages
are:
Warning: Unrecognised escape sequence '\1'
Warning: Unrecognised escape sequence '\?'
Warning: Unrecognised escape sequence '\.'
Using single quotes let puppet skip expansion / escaping inside the
string.
Change example:
-"wikimedia\.org"
+'wikimedia\.org'
Change-Id: I103e091d14fac90708f15fac544fa5d2996057bb
---
M manifests/role/cache.pp
1 file changed, 13 insertions(+), 13 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 89cd911..e08ba85 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -438,7 +438,7 @@
listener_address => '208.80.154.154', #
analytics1001
port => '8422',
instance_name => '',
- cli_args => "-m RxURL:^/event\.gif\?.
-D",
+ cli_args => '-m RxURL:^/event\.gif\?.
-D',
log_fmt =>
"%U\t%q\t%{Host}i\t%t\t%h\t%{X-Forwarded-For}i\t%{Referer}i\t%{Accept-Language}i\t%{Cookie}i\t%{X-WAP-Profile}i\t%{User-agent}i\t%l\t%n",
monitor => false,
}
@@ -451,7 +451,7 @@
listener_address => $event_listener,
port => '8422',
instance_name => '',
- cli_args => "-m RxURL:^/event\.gif\?. -D",
+ cli_args => '-m RxURL:^/event\.gif\?. -D',
log_fmt => "%q\t%l\t%n\t%t\t%h",
monitor => false,
}
@@ -498,9 +498,9 @@
$backend_weight = 100
$storage_size_bigobj = 50
- if regsubst($::memorytotal, "^([0-9]+)\.[0-9]* GB$", "\1") > 96
{
+ if regsubst($::memorytotal, '^([0-9]+)\.[0-9]* GB$', '\1') > 96
{
$memory_storage_size = 16
- } elsif regsubst($::memorytotal, "^([0-9]+)\.[0-9]* GB$", "\1")
> 32 {
+ } elsif regsubst($::memorytotal, '^([0-9]+)\.[0-9]* GB$', '\1')
> 32 {
$memory_storage_size = 8
} else {
$memory_storage_size = 1
@@ -569,12 +569,12 @@
},
backend_options => [
{
- 'backend_match' =>
"^cp[0-9]+\.eqiad\.wmnet$",
+ 'backend_match' =>
'^cp[0-9]+\.eqiad\.wmnet$',
'port' => 3128,
'probe' => "varnish",
},
{
- 'backend_match' =>
"^srv193\.pmtpa\.wmnet$",
+ 'backend_match' =>
'^srv193\.pmtpa\.wmnet$',
'max_connections' => 20,
},
{
@@ -722,17 +722,17 @@
backend_options => [
# FIXME: remove after migration
{
- 'backend_match' =>
"^dysprosium\.eqiad\.wmnet$",
+ 'backend_match' =>
'^dysprosium\.eqiad\.wmnet$',
'weight' => 80,
#'port' => 3128,
#'probe' => "varnish",
},
{
- 'backend_match' =>
"^cp10[23][0-9]\.eqiad\.wmnet$",
+ 'backend_match' =>
'^cp10[23][0-9]\.eqiad\.wmnet$',
'weight' => 20,
},
{
- 'backend_match' =>
"^cp[0-9]+\.eqiad.wmnet$",
+ 'backend_match' =>
'^cp[0-9]+\.eqiad.wmnet$',
'port' => 3128,
'probe' => "varnish",
},
@@ -765,11 +765,11 @@
},
backend_options => [
{
- 'backend_match' =>
"^dysprosium\.eqiad\.wmnet$",
+ 'backend_match' =>
'^dysprosium\.eqiad\.wmnet$',
'weight' => 80,
},
{
- 'backend_match' =>
"^cp10[23][0-9]\.eqiad\.wmnet$",
+ 'backend_match' =>
'^cp10[23][0-9]\.eqiad\.wmnet$',
'weight' => 20,
},
{
@@ -850,7 +850,7 @@
}
$cluster_options = merge($common_cluster_options,
$realm_cluster_options)
- if regsubst($::memorytotal, "^([0-9]+)\.[0-9]* GB$", "\1") > 96
{
+ if regsubst($::memorytotal, '^([0-9]+)\.[0-9]* GB$', '\1') > 96
{
$memory_storage_size = 32
} else {
$memory_storage_size = 2
@@ -977,7 +977,7 @@
},
backend_options => [
{
- 'backend_match' =>
"^srv193\.pmtpa\.wmnet$",
+ 'backend_match' =>
'^srv193\.pmtpa\.wmnet$',
'max_connections' => 20,
},
{
--
To view, visit https://gerrit.wikimedia.org/r/71329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I103e091d14fac90708f15fac544fa5d2996057bb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
