jenkins-bot has submitted this change and it was merged.
Change subject: Remove memcached
......................................................................
Remove memcached
Redis is now used, so this is no longer necessary. However, there is
no ensure => absent, so it won't be removed automatically from existing
installations.
Change-Id: I2eb7c8cd8b62cedf78447a0c9e814250df4b4d98
---
D puppet/modules/memcached/manifests/init.pp
D puppet/modules/memcached/templates/memcached.conf.erb
M puppet/modules/php/manifests/init.pp
3 files changed, 0 insertions(+), 55 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/memcached/manifests/init.pp
b/puppet/modules/memcached/manifests/init.pp
deleted file mode 100644
index b4a26f9..0000000
--- a/puppet/modules/memcached/manifests/init.pp
+++ /dev/null
@@ -1,42 +0,0 @@
-# == Class: memcached
-#
-# Configures a memcached instance.
-#
-# === Parameters
-#
-# [*size_mb*]
-# Size of memcached store, in megabytes (default: 200).
-#
-# [*port*]
-# Memcached server will listen on this port (default: 11211).
-#
-# [*iface*]
-# Interface memcached server will bind to (default: all interfaces).
-#
-# === Examples
-#
-# class { 'memcached':
-# size_mb => 500,
-# }
-#
-class memcached(
- $size_mb = 200,
- $port = 11211,
- $iface = '0.0.0.0',
-) {
-
- package { 'memcached':
- ensure => present,
- }
-
- file { '/etc/memcached.conf':
- content => template('memcached/memcached.conf.erb'),
- notify => Service['memcached'],
- }
-
- service { 'memcached':
- ensure => running,
- enable => true,
- require => Package['memcached'],
- }
-}
diff --git a/puppet/modules/memcached/templates/memcached.conf.erb
b/puppet/modules/memcached/templates/memcached.conf.erb
deleted file mode 100644
index 3994efd..0000000
--- a/puppet/modules/memcached/templates/memcached.conf.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration file for memcached.
-# This file is managed by Puppet.
-#
--d
--m <%= @size_mb %>
--p <%= @port %>
--u nobody
--l <%= @iface %>
--c 20000
--n 5
--f 1.05
-logfile /var/log/memcached.log
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 6994467..6317058 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -17,7 +17,6 @@
'php5-gd',
'php5-intl',
'php5-mcrypt',
- 'php5-memcached',
'php5-mysql',
'php5-xdebug'
]:
--
To view, visit https://gerrit.wikimedia.org/r/89153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2eb7c8cd8b62cedf78447a0c9e814250df4b4d98
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
