Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: puppet_compiler: misc improvements
......................................................................
puppet_compiler: misc improvements
- labs/private, not labs/puppet is the name of the dir
- upgraded file_line to match the new compiler
- added the home env to the differ installation
Change-Id: I4ddd79364ec4b1e93711885d02b26f4bb03aaba3
---
M modules/puppet_compiler/manifests/init.pp
M modules/puppet_compiler/manifests/setup.pp
M modules/puppet_compiler/manifests/web.pp
3 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index e23dd5f..da68da8 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -46,7 +46,7 @@
}
# Git clone labs/private
- git::clone { 'labs/puppet':
+ git::clone { 'labs/private':
ensure => $ensure,
directory => "${libdir}/puppet",
owner => $user,
diff --git a/modules/puppet_compiler/manifests/setup.pp
b/modules/puppet_compiler/manifests/setup.pp
index 5fca8ea..c92afe8 100644
--- a/modules/puppet_compiler/manifests/setup.pp
+++ b/modules/puppet_compiler/manifests/setup.pp
@@ -21,9 +21,10 @@
# Install the puppet catalog diff face
exec { 'install puppet catalog diff':
- command => "/usr/bin/puppet module install zack-catalog_diff",
- creates => "${homedir}/.puppet/modules/catalog_diff",
- user => $user,
+ command => "/usr/bin/puppet module install zack-catalog_diff",
+ creates => "${homedir}/.puppet/modules/catalog_diff",
+ user => $user,
+ environment => "HOME=${homedir}"
}
}
diff --git a/modules/puppet_compiler/manifests/web.pp
b/modules/puppet_compiler/manifests/web.pp
index 94a1770..b94fae2 100644
--- a/modules/puppet_compiler/manifests/web.pp
+++ b/modules/puppet_compiler/manifests/web.pp
@@ -8,8 +8,8 @@
file_line { 'modify_nginx_magic_types':
path => '/etc/nginx/mime.types',
- line => "\ttext/plain\t\t\t\ttxt pson warnings out diff formatted;",
- match => "\ttext/plain\t\t\t\ttxt",
+ line => " text/plain txt pson err
diff;",
+ match => "\s+text/plain\s+txt",
require => Nginx::Site['puppet-compiler'],
notify => Service['nginx']
}
--
To view, visit https://gerrit.wikimedia.org/r/231527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ddd79364ec4b1e93711885d02b26f4bb03aaba3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
