Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/385125 )
Change subject: cyberbot::db: don't use broken mysql::server class
......................................................................
cyberbot::db: don't use broken mysql::server class
This class has hardcoded precise(!sic) APT sources list
if package name is set to mariadb. This can't work and i'm not
sure how it works on quarry which is currently on trusty but has
the precise sources as well.
Nothing else uses it and there is T165625 to question if it has
any future. So i am _not_ trying to fix that modules as originally
intended.
Just putting a config file in place for now.
Change-Id: Ia2803e3c07205f13bc1a4b81ccf5577d8a72592c
---
A modules/profile/files/cyberbot/my.cnf
M modules/profile/manifests/cyberbot/db.pp
2 files changed, 65 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/385125/1
diff --git a/modules/profile/files/cyberbot/my.cnf
b/modules/profile/files/cyberbot/my.cnf
new file mode 100644
index 0000000..0b25fbe
--- /dev/null
+++ b/modules/profile/files/cyberbot/my.cnf
@@ -0,0 +1,55 @@
+###
+#### This file managed by puppet.
+###
+
+
+[client]
+port = 3306
+socket = /run/mysqld/mysqld.sock
+
+[mysqld_safe]
+socket = /run/mysqld/mysqld.sock
+nice = 0
+
+[mysqld]
+user = mysql
+pid-file = /run/mysqld/mysqld.pid
+socket = /run/mysqld/mysqld.sock
+port = 3306
+basedir = /usr
+datadir = /srv/mysql/data
+tmpdir = /tmp
+skip-external-locking
+
+
+bind_address = 0.0.0.0
+
+
+key_buffer = 1M
+max_allowed_packet = 16M
+thread_stack = 192K
+thread_cache_size = 300
+myisam-recover = BACKUP
+query_cache_limit = 1M
+query_cache_size = 16M
+log_error = /var/log/mysql/mysql.err
+expire_logs_days = 10
+max_binlog_size = 100M
+
+
+
+sql_mode =
+
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet = 16M
+
+[mysql]
+
+[isamchk]
+key_buffer = 16M
+
+!includedir /etc/mysql/conf.d/
+
diff --git a/modules/profile/manifests/cyberbot/db.pp
b/modules/profile/manifests/cyberbot/db.pp
index 7e15df4..71c60cb 100644
--- a/modules/profile/manifests/cyberbot/db.pp
+++ b/modules/profile/manifests/cyberbot/db.pp
@@ -14,11 +14,15 @@
require => File['/srv/mysql'],
}
- class { '::mysql::server':
- package_name => 'mariadb-server',
- config_hash => {
- 'datadir' => '/srv/mysql/data',
- 'bind_address' => '0.0.0.0',
- },
+ require_package('mariadb-server')
+
+ file { '/etc/mysql/my.cnf':
+ ensure => 'present',
+ owner => 'root',
+ group => 'root',
+ mode => '644',
+ source => 'puppet:///modules/profile/cyberbot/my.cnf',
+ require => Package['mariadb-server'];
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/385125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2803e3c07205f13bc1a4b81ccf5577d8a72592c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
