Alexandros Kosiaris has submitted this change and it was merged.
Change subject: base: be pedantic about template filenames
......................................................................
base: be pedantic about template filenames
Add .erb file extension
Change-Id: I6efd96305f6d43d3cc032091ad8a2750b92e329c
---
M modules/base/manifests/environment.pp
R modules/base/templates/environment/bash.bashrc.erb
R modules/base/templates/environment/skel/bashrc.erb
3 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/environment.pp
b/modules/base/manifests/environment.pp
index a74029e..a8c1ecc 100644
--- a/modules/base/manifests/environment.pp
+++ b/modules/base/manifests/environment.pp
@@ -38,14 +38,14 @@
} # /production
'labs': {
file { '/etc/bash.bashrc':
- content => template('base/environment/bash.bashrc'),
+ content => template('base/environment/bash.bashrc.erb'),
owner => 'root',
group => 'root',
mode => '0444',
}
file { '/etc/skel/.bashrc':
- content => template('base/environment/skel/bashrc'),
+ content => template('base/environment/skel/bashrc.erb'),
owner => 'root',
group => 'root',
mode => '0644',
diff --git a/modules/base/templates/environment/bash.bashrc
b/modules/base/templates/environment/bash.bashrc.erb
similarity index 100%
rename from modules/base/templates/environment/bash.bashrc
rename to modules/base/templates/environment/bash.bashrc.erb
diff --git a/modules/base/templates/environment/skel/bashrc
b/modules/base/templates/environment/skel/bashrc.erb
similarity index 100%
rename from modules/base/templates/environment/skel/bashrc
rename to modules/base/templates/environment/skel/bashrc.erb
--
To view, visit https://gerrit.wikimedia.org/r/204741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6efd96305f6d43d3cc032091ad8a2750b92e329c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
