Andrew Bogott has submitted this change and it was merged.
Change subject: toollabs: remove old tips absent declarations.
......................................................................
toollabs: remove old tips absent declarations.
Also, apache isn't needed there.
Spoke to Coren, he said it is safe to remove
Change-Id: Ia1683366b57774eca123265863c2c9e100c990c0
---
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/init.pp
M modules/toollabs/manifests/webnode.pp
3 files changed, 0 insertions(+), 12 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 34b9a33..385c686 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -66,12 +66,6 @@
require => Package['grep'],
}
- file { [ '/data/project/.system/tips.sh',
- '/data/project/.system/bin/tips.sh',
- '/data/project/.system/bin/tips2.sh' ]:
- ensure => absent,
- }
-
package { "misctools":
ensure => latest,
}
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index b961a74..7fcc5af 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -63,11 +63,6 @@
target => "/data/project/.shared";
}
- # Replaced by toollabs::bastion's /etc/profile.d/motd-tips.sh.
- file { "/etc/profile.d/tips.sh":
- ensure => absent,
- }
-
file { "/root/.bashrc":
ensure => file,
source => "puppet:///modules/toollabs/rootrc",
diff --git a/modules/toollabs/manifests/webnode.pp
b/modules/toollabs/manifests/webnode.pp
index 29069de..208ba9f 100644
--- a/modules/toollabs/manifests/webnode.pp
+++ b/modules/toollabs/manifests/webnode.pp
@@ -78,7 +78,6 @@
}
package { 'lighttpd': ensure => present }
- package { 'apache2.2-common': ensure => absent }
file { "/usr/local/bin/tool-lighttpd":
ensure => file,
--
To view, visit https://gerrit.wikimedia.org/r/98379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1683366b57774eca123265863c2c9e100c990c0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Akosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
