Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365611 )
Change subject: profile::piwik::database: puppetize Piwik's database config ...................................................................... profile::piwik::database: puppetize Piwik's database config For historic reasons Piwik has been created using a standard Debian configuration, not puppetized and not following Wikimedia's standards. While this is not the best solution it allow us to keep bohrium consistent. Bug: T164073 Change-Id: I0a28aba3eda5df8e12bb5a0b006ce367519f8e29 --- A modules/profile/files/piwik/my.cnf A modules/profile/manifests/piwik/database.pp M modules/role/manifests/piwik/server.pp 3 files changed, 151 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/11/365611/1 diff --git a/modules/profile/files/piwik/my.cnf b/modules/profile/files/piwik/my.cnf new file mode 100644 index 0000000..48cc615 --- /dev/null +++ b/modules/profile/files/piwik/my.cnf @@ -0,0 +1,130 @@ +# +# The MySQL database server configuration file. +# +# You can copy this to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address = 127.0.0.1 +# +# * Fine Tuning +# +key_buffer = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched +myisam-recover = BACKUP +max_connections = 300 +#table_cache = 64 +#thread_concurrency = 10 +# +# * Query Cache Configuration +# +query_cache_limit = 1M +query_cache_size = 16M +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error log - should be very few entries. +# +log_error = /var/log/mysql/error.log +# +# Here you can see queries with especially long duration +#slow_query_log_file = /var/log/mysql/mysql-slow.log +#slow_query_log = 1 +#long_query_time = 2 +#log_queries_not_using_indexes +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 10 +max_binlog_size = 100M +#binlog_do_db = include_database_name +#binlog_ignore_db = include_database_name +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + + +# Optimize a bit for speed - elukey +innodb_buffer_pool_size = 2048M + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completition + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!includedir /etc/mysql/conf.d/ \ No newline at end of file diff --git a/modules/profile/manifests/piwik/database.pp b/modules/profile/manifests/piwik/database.pp new file mode 100644 index 0000000..ffd61d0 --- /dev/null +++ b/modules/profile/manifests/piwik/database.pp @@ -0,0 +1,20 @@ +# == Class: profile::piwik::database +# +# Set up a simple mysql database for Piwik. This config is not standard +# (as in following Wikimedia's puppet classes) because of historic reasons, +# but it will refactored in the future. For the moment it contains the very +# basic configs added to the standard Debian mysql deployment. +# +class profile::piwik::backup { + + require_package('mysql-server') + + file { '/etc/mysql/my.cnf': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/profile/piwik/my.cnf', + } + +} \ No newline at end of file diff --git a/modules/role/manifests/piwik/server.pp b/modules/role/manifests/piwik/server.pp index 61dee0d..8f20d1d 100644 --- a/modules/role/manifests/piwik/server.pp +++ b/modules/role/manifests/piwik/server.pp @@ -6,9 +6,7 @@ include ::profile::piwik::instance # override profile::backup::enable to disable regular backups include ::profile::piwik::backup - - # TODO - puppetization of mysql instance - require_package('mysql-server') + include ::profile::piwik::database system::role { 'piwik::server': description => 'Analytics piwik server', -- To view, visit https://gerrit.wikimedia.org/r/365611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a28aba3eda5df8e12bb5a0b006ce367519f8e29 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
