[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: Fix typo

[Yuvipanda (Code Review)]

Yuvipanda has submitted this change and it was merged.

Change subject: puppetmaster: Fix typo
..


puppetmaster: Fix typo

Change-Id: Iac3fdb23b3ecf4f340a5ca6346d640ff6ecef9ba
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index 57a94d5..ef094d0 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -73,7 +73,7 @@
 allow_from  => $allow_from,
 secure_private  => false,
 include_conftool=> false,
-prevent_cherrypicks => $prevent_cherrypicks,,
+prevent_cherrypicks => $prevent_cherrypicks,
 config  => merge($encconfig, {
 'thin_storeconfigs' => false,
 'autosign'  => $autosign,

-- 
To view, visit https://gerrit.wikimedia.org/r/312298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac3fdb23b3ecf4f340a5ca6346d640ff6ecef9ba
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 
Gerrit-Reviewer: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: Fix typo

[Yuvipanda (Code Review)]

Yuvipanda has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312298

Change subject: puppetmaster: Fix typo
..

puppetmaster: Fix typo

Change-Id: Iac3fdb23b3ecf4f340a5ca6346d640ff6ecef9ba
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/312298/1

diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index 57a94d5..ef094d0 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -73,7 +73,7 @@
 allow_from  => $allow_from,
 secure_private  => false,
 include_conftool=> false,
-prevent_cherrypicks => $prevent_cherrypicks,,
+prevent_cherrypicks => $prevent_cherrypicks,
 config  => merge($encconfig, {
 'thin_storeconfigs' => false,
 'autosign'  => $autosign,

-- 
To view, visit https://gerrit.wikimedia.org/r/312298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac3fdb23b3ecf4f340a5ca6346d640ff6ecef9ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: Fix typo for .git/config in private repo

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged.

Change subject: puppetmaster: Fix typo for .git/config in private repo
..


puppetmaster: Fix typo for .git/config in private repo

Note the extra hyphen (-)

Change-Id: Ic40e58ad88f519d260e6a774e8ddce135f0d0168
---
M modules/puppetmaster/manifests/gitclone.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/manifests/gitclone.pp 
b/modules/puppetmaster/manifests/gitclone.pp
index 1d2336f..d172731 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -131,7 +131,7 @@
 require => File['/srv/private']
 }
 file { '/srv/private/.git/config':
-source  => 
'puppet:///modules/puppetmaster/git/private/git-config-master',
+source  => 
'puppet:///modules/puppetmaster/git/private/gitconfig-master',
 owner   => 'gitpuppet',
 group   => 'gitpuppet',
 mode=> '0550',

-- 
To view, visit https://gerrit.wikimedia.org/r/310007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic40e58ad88f519d260e6a774e8ddce135f0d0168
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: Fix typo for .git/config in private repo

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310007

Change subject: puppetmaster: Fix typo for .git/config in private repo
..

puppetmaster: Fix typo for .git/config in private repo

Note the extra hyphen (-)

Change-Id: Ic40e58ad88f519d260e6a774e8ddce135f0d0168
---
M modules/puppetmaster/manifests/gitclone.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/310007/1

diff --git a/modules/puppetmaster/manifests/gitclone.pp 
b/modules/puppetmaster/manifests/gitclone.pp
index 1d2336f..d172731 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -131,7 +131,7 @@
 require => File['/srv/private']
 }
 file { '/srv/private/.git/config':
-source  => 
'puppet:///modules/puppetmaster/git/private/git-config-master',
+source  => 
'puppet:///modules/puppetmaster/git/private/gitconfig-master',
 owner   => 'gitpuppet',
 group   => 'gitpuppet',
 mode=> '0550',

-- 
To view, visit https://gerrit.wikimedia.org/r/310007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic40e58ad88f519d260e6a774e8ddce135f0d0168
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: fix typo in web_frontend

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/306877

Change subject: puppetmaster: fix typo in web_frontend
..

puppetmaster: fix typo in web_frontend

Change-Id: Ida9f9b695ff19c6d9b519f42f9a6d1f7e64568a5
---
M modules/puppetmaster/templates/web-frontend.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/306877/1

diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb 
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 300b307..401af18 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -46,5 +46,5 @@
   allow from all
   
 
-CustomLog /var/log/apache2/puppetmaster.<%= @server_name &>.log wmf
+CustomLog /var/log/apache2/puppetmaster.<%= @server_name %>.log wmf
 

-- 
To view, visit https://gerrit.wikimedia.org/r/306877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida9f9b695ff19c6d9b519f42f9a6d1f7e64568a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppetmaster: fix typo in web_frontend

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: puppetmaster: fix typo in web_frontend
..


puppetmaster: fix typo in web_frontend

Change-Id: Ida9f9b695ff19c6d9b519f42f9a6d1f7e64568a5
---
M modules/puppetmaster/templates/web-frontend.conf.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/templates/web-frontend.conf.erb 
b/modules/puppetmaster/templates/web-frontend.conf.erb
index 300b307..401af18 100644
--- a/modules/puppetmaster/templates/web-frontend.conf.erb
+++ b/modules/puppetmaster/templates/web-frontend.conf.erb
@@ -46,5 +46,5 @@
   allow from all
   
 
-CustomLog /var/log/apache2/puppetmaster.<%= @server_name &>.log wmf
+CustomLog /var/log/apache2/puppetmaster.<%= @server_name %>.log wmf
 

-- 
To view, visit https://gerrit.wikimedia.org/r/306877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida9f9b695ff19c6d9b519f42f9a6d1f7e64568a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits