Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91603
Change subject: Mariadb module
......................................................................
Mariadb module
Uses mysql module of puppetlabs with mariadb repo
Change-Id: I00e0cd5e74cbdec14398166f93ac44be419403f4
---
M .gitmodules
M puppet/modules/base/manifests/init.pp
A puppet/modules/mariadb/manifests/init.pp
A puppet/modules/mysql
M puppet/site.pp
5 files changed, 32 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/03/91603/1
diff --git a/.gitmodules b/.gitmodules
index 0b862c8..513bdaa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
[submodule "puppet/modules/apt"]
path = puppet/modules/apt
url = https://github.com/puppetlabs/puppetlabs-apt.git
+[submodule "puppet/modules/mysql"]
+ path = puppet/modules/mysql
+ url = https://github.com/puppetlabs/puppetlabs-mysql.git
diff --git a/puppet/modules/base/manifests/init.pp
b/puppet/modules/base/manifests/init.pp
index 18cf7a7..fc5ac60 100644
--- a/puppet/modules/base/manifests/init.pp
+++ b/puppet/modules/base/manifests/init.pp
@@ -22,4 +22,4 @@
'subversion',
]: 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..37381c4
--- /dev/null
+++ b/puppet/modules/mariadb/manifests/init.pp
@@ -0,0 +1,27 @@
+class mariadb {
+ apt::source { 'mariadb':
+ location => 'http://mirror3.layerjet.com/mariadb/repo/5.5/ubuntu',
+ release => "${::lsbdistcodename}",
+ repos => 'main',
+ key => 'cbcb082a1bb943db',
+ key_server => 'keyserver.ubuntu.com',
+ }
+
+ class { '::mysql::server':
+ package_name => 'mariadb-server',
+ require => Apt::Source['mariadb'],
+ override_options => {
+ mysqld => {
+ character-set-server => 'utf8'
+ },
+ client => {
+ default-character-set => 'utf8'
+ }
+ }
+ }
+
+ class { '::mysql::client':
+ package_name => 'mariadb-client',
+ require => Apt::Source['mariadb']
+ }
+}
diff --git a/puppet/modules/mysql b/puppet/modules/mysql
new file mode 160000
index 0000000..6ec7872
--- /dev/null
+++ b/puppet/modules/mysql
+Subproject commit 6ec7872b444eb6caa3cfeb0117f975d9add70906
diff --git a/puppet/site.pp b/puppet/site.pp
index f7c3242..9298464 100644
--- a/puppet/site.pp
+++ b/puppet/site.pp
@@ -9,11 +9,11 @@
include php
include puppet
include memcached
+ include mariadb
package { 'elasticsearch':
provider => dpkg,
ensure => latest,
source => '/root/packages/elasticsearch-0.90.3.deb'
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/91603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00e0cd5e74cbdec14398166f93ac44be419403f4
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
