jenkins-bot has submitted this change and it was merged.
Change subject: Always install 'nano'
......................................................................
Always install 'nano'
Change-Id: I71d4f93495bd73fe1e43277be6d9eb32bdc74e1c
---
M puppet/modules/misc/manifests/init.pp
1 file changed, 13 insertions(+), 3 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/misc/manifests/init.pp
b/puppet/modules/misc/manifests/init.pp
index fc4f3ef..df29f6d 100644
--- a/puppet/modules/misc/manifests/init.pp
+++ b/puppet/modules/misc/manifests/init.pp
@@ -22,7 +22,15 @@
mode => '0755',
}
- package { [ 'ack-grep', 'htop', 'curl', 'httpie', 'jq' ]:
+ # Install generally useful packages
+ package { [
+ 'ack-grep',
+ 'curl',
+ 'htop',
+ 'httpie',
+ 'jq',
+ 'nano', # for legoktm and other vi haters
+ ]:
ensure => present,
}
@@ -34,8 +42,10 @@
# fix for 'stdin: not a tty'
# <https://github.com/mitchellh/vagrant/issues/1673>
exec { 'fix_root_profile':
- command => 'sed -i -e "s/^mesg n/tty -s \&\& mesg n/" /root/.profile',
- onlyif => 'grep -q "^mesg n" /root/.profile',
+ # lint:ignore:80chars
+ command => '/bin/sed -i -e "s/^mesg n/tty -s \&\& mesg n/"
/root/.profile',
+ # lint:endignore
+ onlyif => '/bin/grep -q "^mesg n" /root/.profile',
}
env::profile_script { 'xdebug':
--
To view, visit https://gerrit.wikimedia.org/r/228398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71d4f93495bd73fe1e43277be6d9eb32bdc74e1c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
