Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87716
Change subject: ome prep work for the new server
......................................................................
ome prep work for the new server
Change-Id: I570a684a49926deb3e8490d26d5d661835b3b810
---
M puppet/modules/base/manifests/init.pp
A puppet/modules/mariadb/manifests/init.pp
M puppet/modules/php/manifests/init.pp
M puppet/site.pp
4 files changed, 49 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/16/87716/1
diff --git a/puppet/modules/base/manifests/init.pp
b/puppet/modules/base/manifests/init.pp
index 18cf7a7..c17435f 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -20,6 +20,14 @@
'git-core',
'mercurial',
'subversion',
+
+ # Other helpful tools
+ 'htop', # Needs introduction?
+ 'iotop', # IO view
+ 'iperf', # Network performance
+ 'jnettop', # Network view
+ 'mytop', # MySQL view
+ 'python-software-properties', # Enables add-apt-repository
]: ensure => present,
}
-}
\ No newline at end of file
+}
diff --git a/puppet/modules/mariadb/manifests/init.pp
b/puppet/modules/mariadb/manifests/init.pp
new file mode 100644
index 0000000..3f8eed6
--- /dev/null
+++ b/puppet/modules/mariadb/manifests/init.pp
@@ -0,0 +1,38 @@
+# Based on from
https://gist.github.com/foliant/5804780/raw/3e16d695914e90a03e6733ae4e1b3239c5de53f2/mariadb.pp
+class mariadb{
+ exec { 'Import Mariadb key':
+ command => '/usr/bin/apt-key adv --recv-keys --keyserver
keyserver.ubuntu.com 0xcbcb082a1bb943db && /usr/bin/touch
/root/.my.keyimported',
+ creates => '/root/.my.keyimported',
+ }
+
+ file { '/etc/apt/sources.list.d/mariadb-55-precise.list':
+ content => 'deb http://mirror3.layerjet.com/mariadb/repo/5.5/ubuntu
precise main
+deb-src http://mirror3.layerjet.com/mariadb/repo/5.5/ubuntu precise main',
+ }
+
+ # apt-update should probably be moved to a different manifest file
+ exec { 'apt-update':
+ command => '/usr/bin/apt-get update',
+ onlyif => "/bin/sh -c '[ ! -f /var/cache/apt/pkgcache.bin ] ||
/usr/bin/find /etc/apt/* -cnewer /var/cache/apt/pkgcache.bin | /bin/grep . >
/dev/null'",
+ }
+
+ package { 'libmysqlclient-maria':
+ name => 'libmysqlclient18=5.5.33+maria-1~precise',
+ ensure => 'installed',
+ }
+
+ package { 'mysql-common-maria':
+ name => 'mysql-common=5.5.33+maria-1~precise',
+ ensure => 'installed',
+ }
+
+ package { 'mariadb-server':
+ ensure => 'installed',
+ }
+
+ package { 'mariadb-client':
+ ensure => 'installed',
+ }
+
+ Exec['Import Mariadb key'] -> File['/etc/apt/sources.list.d/maria.list'] ->
Exec['apt-update'] -> Package["mysql-common-maria"] ->
Package["libmysqlclient-maria"] -> Package['mariadb-server'] ->
Package['mariadb-client']
+}
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 73d2ab2..519917e 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -1,4 +1,5 @@
class php {
+ # add-apt-repository ppa:ondrej/php5-oldstable
package { ['php5-cli', 'php5-curl', 'php5-fpm', 'php5-gd', 'php5-intl',
'php5-mysql', 'php-pear' ]:
ensure => present,
diff --git a/puppet/site.pp b/puppet/site.pp
index f7c3242..5dbc3ac 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -10,7 +10,7 @@
include puppet
include memcached
- package { 'elasticsearch':
+ package {'elasticsearch':
provider => dpkg,
ensure => latest,
source => '/root/packages/elasticsearch-0.90.3.deb'
--
To view, visit https://gerrit.wikimedia.org/r/87716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I570a684a49926deb3e8490d26d5d661835b3b810
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
