From b31cf9642802fa1e276ae14118bba6297c019a26 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Thu, 23 Aug 2018 23:16:30 +0300 Subject: [PATCH 1/9] add ability to split config into 2 files --- CONTRIBUTORS | 1 + README.markdown | 8 +++++ manifests/config.pp | 13 ++++++++ manifests/init.pp | 15 +++++++++ manifests/install.pp | 9 +++++ manifests/params.pp | 7 ++-- templates/proxysql.cnf.erb | 10 +++--- templates/proxysql_proxy.cnf.erb | 56 ++++++++++++++++++++++++++++++++ 8 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 templates/proxysql_proxy.cnf.erb diff --git a/CONTRIBUTORS b/CONTRIBUTORS index e59b824a..4c35044f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -4,3 +4,4 @@ Matthias Crauwels (@mcrauwel) Narcis Pillao (@narcisbcn) Rudy Gevaert (@rgevaert) Tim Meusel (@bastelfreak) +Maxim Fedotov (@MaxFedotov) \ No newline at end of file diff --git a/README.markdown b/README.markdown index 31c11df2..250b0d90 100644 --- a/README.markdown +++ b/README.markdown @@ -321,6 +321,14 @@ Array of mysql_rules, that will be created in ProxySQL. Defaults to undef ##### `schedulers` Array of schedulers, that will be created in ProxySQL. Defaults to undef +##### `split_config` +If set, ProxySQL config file will be split in 2: main config file with admin and mysql variables and proxy config file with servers\users\hostgroups\scheduler\rules params. Defaults to false + +##### `proxy_config_file` +The file where servers\users\hostgroups\scheduler\rules params of ProxySQL configuration are saved. This will only be configured if `split_config` is set to `true`. Defaults to 'proxysql_proxy.cnf' + +#####`manage_proxy_config_file` +Determines wheter this module will update the ProxySQL proxy configuration file. Defaults to 'true' ## Types #### proxy_global_variable diff --git a/manifests/config.pp b/manifests/config.pp index 11607ba1..ff642d6d 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -5,6 +5,7 @@ class proxysql::config { $config_settings = $proxysql::config_settings + $proxy_config_file = $proxysql::proxy_config_file if $proxysql::manage_config_file { file { 'proxysql-config-file': ensure => file, @@ -17,4 +18,16 @@ } } + if $proxysql::split_config { + file { 'proxysql-proxy-config-file': + ensure => file, + path => $proxysql::proxy_config_file, + content => template('proxysql/proxysql_proxy.cnf.erb'), + mode => '0640', + owner => $proxysql::sys_owner, + group => $proxysql::sys_group, + selinux_ignore_defaults => true, + replace => $proxysql::manage_proxy_config_file, + } + } } diff --git a/manifests/init.pp b/manifests/init.pp index 6d0eccf8..7debddc2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -133,6 +133,16 @@ # # * `schedulers` # Array of schedulers, that will be created in ProxySQL. Defaults to undef +# * `split_config` +# If set, ProxySQL config file will be split in 2: main config file with admin and mysql variables +# and proxy config file with servers\users\hostgroups\scheduler params. Defaults to false +# +# * `proxy_config_file` +# The file where servers\users\hostgroups\scheduler\rules params of ProxySQL configuration are saved +# This will only be configured if `split_config` is set to `true`. Defaults to 'proxysql_proxy.cnf' +# +# * `manage_proxy_config_file` +# Determines wheter this module will update the ProxySQL proxy configuration file. Defaults to 'true' # class proxysql ( Optional[String] $cluster_name = $proxysql::params::cluster_name, @@ -158,6 +168,11 @@ String $monitor_username = $proxysql::params::monitor_username, Sensitive[String] $monitor_password = $proxysql::params::monitor_password, + Boolean $split_config = $proxysql::params::split_config, + + String $proxy_config_file = $proxysql::params::proxy_config_file, + Boolean $manage_proxy_config_file = $proxysql::params::manage_proxy_config_file, + String $config_file = $proxysql::params::config_file, Boolean $manage_config_file = $proxysql::params::manage_config_file, diff --git a/manifests/install.pp b/manifests/install.pp index 2bc75e16..84cdb74e 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -35,6 +35,15 @@ } } + group { $::proxysql::sys_group: + ensure => 'present', + } + + user { $::proxysql::sys_owner: + ensure => 'present', + groups => $::proxysql::sys_group, + } + file { 'proxysql-datadir': ensure => directory, path => $proxysql::datadir, diff --git a/manifests/params.pp b/manifests/params.pp index 0bfa2714..8757baab 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -117,8 +117,11 @@ $datadir = '/var/lib/proxysql' - $config_file = '/etc/proxysql.cnf' - $manage_config_file = true + $split_config = false + $config_file = '/etc/proxysql.cnf' + $manage_config_file = true + $proxy_config_file = '/etc/proxysql_proxy.cnf' + $manage_proxy_config_file = true $mycnf_file_name = '/root/.my.cnf' $manage_mycnf_file = true diff --git a/templates/proxysql.cnf.erb b/templates/proxysql.cnf.erb index 60eaf374..b38cc4ac 100644 --- a/templates/proxysql.cnf.erb +++ b/templates/proxysql.cnf.erb @@ -12,7 +12,6 @@ default_handler = Proc.new do |k, v| <% end end - hash_handler = Proc.new do |k, v| if v.is_a?(Hash) -%> @@ -27,7 +26,6 @@ hash_handler = Proc.new do |k, v| default_handler.call(k, v) end end - @config_settings.map do |k, v| if v.is_a?(Hash) if k == 'admin_variables' || k == 'mysql_variables' @@ -42,6 +40,7 @@ end <% else -%> +<% if scope.lookupvar('::proxysql::split_config') == false -%> <%= k %> = ( <% v.each do |ki, vi| @@ -50,7 +49,6 @@ end else default_handler.call(ki, vi) end - if v.keys.index(ki) < v.size - 1 -%> , @@ -60,7 +58,7 @@ end -%> ) - +<% end -%> <% end else @@ -68,3 +66,7 @@ end end end -%> + +<% if scope.lookupvar('::proxysql::split_config') == true -%> +@include "<%= @proxy_config_file %>" +<% end -%> diff --git a/templates/proxysql_proxy.cnf.erb b/templates/proxysql_proxy.cnf.erb new file mode 100644 index 00000000..7413a743 --- /dev/null +++ b/templates/proxysql_proxy.cnf.erb @@ -0,0 +1,56 @@ +<% +default_handler = Proc.new do |k, v| + if v.is_a?(Integer) || v.is_a?(TrueClass) || v.is_a?(FalseClass) +-%> + <%= k %> = <%= v %> +<% + else +-%> + <%= k %> = "<%= v %>" +<% + end +end +hash_handler = Proc.new do |k, v| + if v.is_a?(Hash) +-%> + { +<% + v.map do |ki, vi| + hash_handler.call(ki, vi) + end +-%> + }<% + else + default_handler.call(k, v) + end +end +@config_settings.map do |k, v| + if v.is_a?(Hash) + if k == 'admin_variables' || k == 'mysql_variables' +-%> +<% + else +-%> +<%= k %> = ( +<% + v.each do |ki, vi| + if vi.is_a?(Hash) + hash_handler.call(ki, vi) + else + default_handler.call(ki, vi) + end + if v.keys.index(ki) < v.size - 1 +-%> +, +<% + end + end +-%> + +) + +<% + end + end +end +-%> From 51ef5f71339efe0f56488c7008dd79707d8ff389 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Fri, 24 Aug 2018 01:09:54 +0300 Subject: [PATCH 2/9] add config reload --- manifests/init.pp | 1 + manifests/reload_config.pp | 21 +++++++++++++++++++++ spec/classes/proxysql_spec.rb | 3 ++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 manifests/reload_config.pp diff --git a/manifests/init.pp b/manifests/init.pp index 7debddc2..5487abc7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -247,6 +247,7 @@ -> class { 'proxysql::config':} -> class { 'proxysql::service':} -> class { 'proxysql::admin_credentials':} + -> class { 'proxysql::reload_config':} -> class { 'proxysql::configure':} -> anchor { 'proxysql::end': } diff --git a/manifests/reload_config.pp b/manifests/reload_config.pp new file mode 100644 index 00000000..29781a22 --- /dev/null +++ b/manifests/reload_config.pp @@ -0,0 +1,21 @@ +# == Class proxysql::reload_config +# +# This class is called from proxysql to update config if it changed. +# +class proxysql::reload_config { + + $mycnf_file_name = $proxysql::mycnf_file_name + exec {'reload-config': + command => "/usr/bin/mysql --defaults-extra-file=${mycnf_file_name} --execute=\" + LOAD ADMIN VARIABLES FROM CONFIG; \ + LOAD ADMIN VARIABLES TO RUNTIME; \ + SAVE ADMIN VARIABLES TO DISK; \ + LOAD MYSQL VARIABLES FROM CONFIG; \ + LOAD MYSQL VARIABLES TO RUNTIME; \ + SAVE MYSQL VARIABLES TO DISK; \" + ", + subscribe => [ File['proxysql-config-file'], File['proxysql-proxy-config-file'] ], + require => [ Service[$::proxysql::service_name] , File['root-mycnf-file'] ], + refreshonly => true, + } +} diff --git a/spec/classes/proxysql_spec.rb b/spec/classes/proxysql_spec.rb index 8499ba8d..9f0fb90e 100644 --- a/spec/classes/proxysql_spec.rb +++ b/spec/classes/proxysql_spec.rb @@ -18,7 +18,8 @@ it { is_expected.to contain_class('proxysql::install').that_comes_before('Class[proxysql::config]') } it { is_expected.to contain_class('proxysql::config').that_comes_before('Class[proxysql::service]') } it { is_expected.to contain_class('proxysql::service').that_comes_before('Class[proxysql::admin_credentials]') } - it { is_expected.to contain_class('proxysql::admin_credentials').that_comes_before('Class[proxysql::configure]') } + it { is_expected.to contain_class('proxysql::admin_credentials').that_comes_before('Class[proxysql::reload_config]') } + it { is_expected.to contain_class('proxysql::reload_config').that_comes_before('Class[proxysql::configure]') } it { is_expected.to contain_class('proxysql::configure').that_comes_before('Anchor[proxysql::end]') } it { is_expected.to contain_anchor('proxysql::end') } From 3d7d6a0bfa07b5c812b1b930253b07fdaf4eeb7d Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Fri, 24 Aug 2018 01:18:23 +0300 Subject: [PATCH 3/9] add config reload --- manifests/reload_config.pp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/reload_config.pp b/manifests/reload_config.pp index 29781a22..b550caba 100644 --- a/manifests/reload_config.pp +++ b/manifests/reload_config.pp @@ -4,6 +4,11 @@ # class proxysql::reload_config { + $subscribe = $proxysql::split_config ? { + true => [ File['proxysql-config-file'], File['proxysql-proxy-config-file'] ], + false => File['proxysql-config-file'], + } + $mycnf_file_name = $proxysql::mycnf_file_name exec {'reload-config': command => "/usr/bin/mysql --defaults-extra-file=${mycnf_file_name} --execute=\" @@ -14,7 +19,7 @@ LOAD MYSQL VARIABLES TO RUNTIME; \ SAVE MYSQL VARIABLES TO DISK; \" ", - subscribe => [ File['proxysql-config-file'], File['proxysql-proxy-config-file'] ], + subscribe => $subscribe, require => [ Service[$::proxysql::service_name] , File['root-mycnf-file'] ], refreshonly => true, } From fe84efddee0f082f9ba758b233ae6dbb65632e6e Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Sat, 1 Sep 2018 17:04:08 +0300 Subject: [PATCH 4/9] apply review notes. Change $:: to $. Use facts[]. Change erb template to epp --- manifests/config.pp | 4 ++- templates/proxysql.cnf.erb | 4 +-- templates/proxysql_proxy.cnf.epp | 18 ++++++++++ templates/proxysql_proxy.cnf.erb | 56 -------------------------------- 4 files changed, 23 insertions(+), 59 deletions(-) create mode 100644 templates/proxysql_proxy.cnf.epp delete mode 100644 templates/proxysql_proxy.cnf.erb diff --git a/manifests/config.pp b/manifests/config.pp index ff642d6d..22a9fbc6 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -6,6 +6,8 @@ $config_settings = $proxysql::config_settings $proxy_config_file = $proxysql::proxy_config_file + $split_config = $proxysql::split_config + if $proxysql::manage_config_file { file { 'proxysql-config-file': ensure => file, @@ -22,7 +24,7 @@ file { 'proxysql-proxy-config-file': ensure => file, path => $proxysql::proxy_config_file, - content => template('proxysql/proxysql_proxy.cnf.erb'), + content => epp('proxysql/proxysql_proxy.cnf.epp', { config_settings => $config_settings }), mode => '0640', owner => $proxysql::sys_owner, group => $proxysql::sys_group, diff --git a/templates/proxysql.cnf.erb b/templates/proxysql.cnf.erb index b38cc4ac..bb946a32 100644 --- a/templates/proxysql.cnf.erb +++ b/templates/proxysql.cnf.erb @@ -40,7 +40,7 @@ end <% else -%> -<% if scope.lookupvar('::proxysql::split_config') == false -%> +<% if @split_config == false -%> <%= k %> = ( <% v.each do |ki, vi| @@ -67,6 +67,6 @@ end end -%> -<% if scope.lookupvar('::proxysql::split_config') == true -%> +<% if @split_config == true -%> @include "<%= @proxy_config_file %>" <% end -%> diff --git a/templates/proxysql_proxy.cnf.epp b/templates/proxysql_proxy.cnf.epp new file mode 100644 index 00000000..5297a5c5 --- /dev/null +++ b/templates/proxysql_proxy.cnf.epp @@ -0,0 +1,18 @@ +<%- | Hash $config_settings | -%> +<% $config_settings.each |$key, $value| { -%> +<% if $key == "mysql_servers" { -%> +<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>) +<% } -%> +<% if $key == "mysql_users" { -%> +<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>) +<% } -%> +<% if $key == "mysql_query_rules" { -%> +<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>) +<% } -%> +<% if $key == "scheduler" { -%> +<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>) +<% } -%> +<% if $key == "mysql_replication_hostgroups" { -%> +<%= $key %> = (<% if $value != {} { -%><%= $value %><% } -%>) +<% } -%> +<% } -%> diff --git a/templates/proxysql_proxy.cnf.erb b/templates/proxysql_proxy.cnf.erb deleted file mode 100644 index 7413a743..00000000 --- a/templates/proxysql_proxy.cnf.erb +++ /dev/null @@ -1,56 +0,0 @@ -<% -default_handler = Proc.new do |k, v| - if v.is_a?(Integer) || v.is_a?(TrueClass) || v.is_a?(FalseClass) --%> - <%= k %> = <%= v %> -<% - else --%> - <%= k %> = "<%= v %>" -<% - end -end -hash_handler = Proc.new do |k, v| - if v.is_a?(Hash) --%> - { -<% - v.map do |ki, vi| - hash_handler.call(ki, vi) - end --%> - }<% - else - default_handler.call(k, v) - end -end -@config_settings.map do |k, v| - if v.is_a?(Hash) - if k == 'admin_variables' || k == 'mysql_variables' --%> -<% - else --%> -<%= k %> = ( -<% - v.each do |ki, vi| - if vi.is_a?(Hash) - hash_handler.call(ki, vi) - else - default_handler.call(ki, vi) - end - if v.keys.index(ki) < v.size - 1 --%> -, -<% - end - end --%> - -) - -<% - end - end -end --%> From 0c9e8abf72db19fddcb1dae56a5e5a3f89d3066b Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 4 Sep 2018 09:25:41 +0300 Subject: [PATCH 5/9] change :: to :. Use Stdlib::Absolutepath for params --- manifests/init.pp | 6 +++--- manifests/install.pp | 6 +++--- manifests/reload_config.pp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 5487abc7..6e986a9d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -153,7 +153,7 @@ String $service_name = $proxysql::params::service_name, String $service_ensure = $proxysql::params::service_ensure, - String $datadir = $proxysql::params::datadir, + Stdlib::Absolutepath $datadir = $proxysql::params::datadir, String $listen_ip = $proxysql::params::listen_ip, Integer $listen_port = $proxysql::params::listen_port, @@ -170,10 +170,10 @@ Boolean $split_config = $proxysql::params::split_config, - String $proxy_config_file = $proxysql::params::proxy_config_file, + Stdlib::Absolutepath $proxy_config_file = $proxysql::params::proxy_config_file, Boolean $manage_proxy_config_file = $proxysql::params::manage_proxy_config_file, - String $config_file = $proxysql::params::config_file, + Stdlib::Absolutepath $config_file = $proxysql::params::config_file, Boolean $manage_config_file = $proxysql::params::manage_config_file, String $mycnf_file_name = $proxysql::params::mycnf_file_name, diff --git a/manifests/install.pp b/manifests/install.pp index 84cdb74e..5db66447 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -35,13 +35,13 @@ } } - group { $::proxysql::sys_group: + group { $proxysql::sys_group: ensure => 'present', } - user { $::proxysql::sys_owner: + user { $proxysql::sys_owner: ensure => 'present', - groups => $::proxysql::sys_group, + groups => $proxysql::sys_group, } file { 'proxysql-datadir': diff --git a/manifests/reload_config.pp b/manifests/reload_config.pp index b550caba..578b793a 100644 --- a/manifests/reload_config.pp +++ b/manifests/reload_config.pp @@ -20,7 +20,7 @@ SAVE MYSQL VARIABLES TO DISK; \" ", subscribe => $subscribe, - require => [ Service[$::proxysql::service_name] , File['root-mycnf-file'] ], + require => [ Service[$proxysql::service_name] , File['root-mycnf-file'] ], refreshonly => true, } } From 0367744e08d13586fec423d303a6a04282633cc0 Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Tue, 4 Sep 2018 09:30:49 +0300 Subject: [PATCH 6/9] add puppetlabs stdlib to dependencies --- metadata.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/metadata.json b/metadata.json index 2219cd16..022c15ea 100644 --- a/metadata.json +++ b/metadata.json @@ -12,6 +12,10 @@ "name": "puppetlabs-mysql", "version_requirement": ">= 2.5.0 < 7.0.0" }, + { + "name": "puppetlabs-stdlib", + "version_requirement": ">= 1.0.0" + }, { "name": "puppetlabs-apt", "version_requirement": ">= 2.1.0 < 6.0.0" From ed2a8e59ca85dd30bbfeff7438c9224a309bacbd Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Thu, 6 Sep 2018 14:13:14 +0300 Subject: [PATCH 7/9] Remove references to stdlib --- manifests/init.pp | 6 +++--- metadata.json | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 6e986a9d..5487abc7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -153,7 +153,7 @@ String $service_name = $proxysql::params::service_name, String $service_ensure = $proxysql::params::service_ensure, - Stdlib::Absolutepath $datadir = $proxysql::params::datadir, + String $datadir = $proxysql::params::datadir, String $listen_ip = $proxysql::params::listen_ip, Integer $listen_port = $proxysql::params::listen_port, @@ -170,10 +170,10 @@ Boolean $split_config = $proxysql::params::split_config, - Stdlib::Absolutepath $proxy_config_file = $proxysql::params::proxy_config_file, + String $proxy_config_file = $proxysql::params::proxy_config_file, Boolean $manage_proxy_config_file = $proxysql::params::manage_proxy_config_file, - Stdlib::Absolutepath $config_file = $proxysql::params::config_file, + String $config_file = $proxysql::params::config_file, Boolean $manage_config_file = $proxysql::params::manage_config_file, String $mycnf_file_name = $proxysql::params::mycnf_file_name, diff --git a/metadata.json b/metadata.json index 022c15ea..2219cd16 100644 --- a/metadata.json +++ b/metadata.json @@ -12,10 +12,6 @@ "name": "puppetlabs-mysql", "version_requirement": ">= 2.5.0 < 7.0.0" }, - { - "name": "puppetlabs-stdlib", - "version_requirement": ">= 1.0.0" - }, { "name": "puppetlabs-apt", "version_requirement": ">= 2.1.0 < 6.0.0" From d2594b31ebc736fec00227e718d4241207cad65b Mon Sep 17 00:00:00 2001 From: Matthias Crauwels Date: Sat, 8 Sep 2018 19:53:08 +0200 Subject: [PATCH 8/9] move user/group management to prerequisites to prevent dependency cycles --- manifests/init.pp | 5 +++-- manifests/install.pp | 8 -------- manifests/prerequisites.pp | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 manifests/prerequisites.pp diff --git a/manifests/init.pp b/manifests/init.pp index 5487abc7..3d228f7a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -102,7 +102,7 @@ # Which configuration variables should be overriden. Hash, defaults to {} (empty hash). # # * `cluster_name` -# If set, proxysql_servers with the same cluster_name will be automatically added to the same cluster and will +# If set, proxysql_servers with the same cluster_name will be automatically added to the same cluster and will # synchronize their configuration parameters. Defaults to undef # # * `cluster_username` @@ -116,7 +116,7 @@ # The name of the mysql client package in your package manager. Defaults to undef # # * `manage_hostgroup_for_servers` -# Determines wheter this module will manage hostgroup_id for mysql_servers. +# Determines wheter this module will manage hostgroup_id for mysql_servers. # If false - it will skip difference in this value between manifest and defined in ProxySQL. Defaults to 'true' # # * `mysql_servers` @@ -242,6 +242,7 @@ # lint:endignore anchor { 'proxysql::begin': } + -> class { 'proxysql::prerequisites':} -> class { 'proxysql::repo':} -> class { 'proxysql::install':} -> class { 'proxysql::config':} diff --git a/manifests/install.pp b/manifests/install.pp index 5db66447..d10f2c75 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -35,14 +35,6 @@ } } - group { $proxysql::sys_group: - ensure => 'present', - } - - user { $proxysql::sys_owner: - ensure => 'present', - groups => $proxysql::sys_group, - } file { 'proxysql-datadir': ensure => directory, diff --git a/manifests/prerequisites.pp b/manifests/prerequisites.pp new file mode 100644 index 00000000..c98ebda3 --- /dev/null +++ b/manifests/prerequisites.pp @@ -0,0 +1,18 @@ +# Class: proxysql::prerequisites +# =========================== +# +# Manage the prerequisites where the ProxySQL package might be +# +class proxysql::prerequisites inherits proxysql { + if $proxysql::sys_owner != 'root' { # let's assume that 'root' will exist and not touch that... + group { $proxysql::sys_group: + ensure => 'present', + } + + user { $proxysql::sys_owner: + ensure => 'present', + groups => $proxysql::sys_group, + } + } + +} From 0b751477837409589e4fe921302f58465fdb12ae Mon Sep 17 00:00:00 2001 From: Matthias Crauwels Date: Mon, 10 Sep 2018 08:47:16 +0200 Subject: [PATCH 9/9] checksums were changed while fixing sysown/proxysql#1679 --- manifests/params.pp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 8757baab..763945e3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -32,14 +32,14 @@ 'Debian': { case $facts['os']['release']['major'] { '8': { - $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.10/proxysql_1.4.10-debian8_amd64.deb' - $package_checksum_value = '98bab1b7cd719039b1483f7d51c30d7fc563def7' + $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.11/proxysql_1.4.11-debian8_amd64.deb' + $package_checksum_value = '813a91ea030ef480c0210b047df5e88ff1c27810' $package_checksum_type = 'sha1' $package_dependencies = [] } '9': { - $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.10/proxysql_1.4.10-debian9_amd64.deb' - $package_checksum_value = 'd97a2f870e46d5f3218ab80d6c0db6bcc288127a' + $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.11/proxysql_1.4.11-debian9_amd64.deb' + $package_checksum_value = '65a3c2b98eefa42946ee59eef18ba18534c2a39d' $package_checksum_type = 'sha1' $package_dependencies = [] } @@ -54,14 +54,14 @@ 'Ubuntu': { case $facts['os']['release']['major'] { '14.04': { - $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.10/proxysql_1.4.10-ubuntu14_amd64.deb' - $package_checksum_value = '0b89f290bd9cd7e8bc2b7acd8a7799840a31af94' + $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.11/proxysql_1.4.11-ubuntu14_amd64.deb' + $package_checksum_value = '42b99a12e8e43410aed88da4c5bbe902c43dbba1' $package_checksum_type = 'sha1' $package_dependencies = [] } '16.04': { - $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.10/proxysql_1.4.10-ubuntu16_amd64.deb' - $package_checksum_value = 'df8695c6296678a0eeda036cddff679cc1ff604e' + $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.11/proxysql_1.4.11-ubuntu16_amd64.deb' + $package_checksum_value = '6e7db2fee78eee1a22cdfabefaa50953c3d24501' $package_checksum_type = 'sha1' $package_dependencies = [] } @@ -95,8 +95,8 @@ } 'RedHat': { $package_provider = 'rpm' - $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.10/proxysql-1.4.10-1-centos67.x86_64.rpm' - $package_checksum_value = 'f5ca4efa9d69e9bd6ba9a96c724b031cd7326051' + $package_source = 'https://github.com/sysown/proxysql/releases/download/v1.4.11/proxysql-1.4.11-1-centos67.x86_64.rpm' + $package_checksum_value = '6f302beaea096b63851a136287818a1b6e049e28' $package_checksum_type = 'sha1' $package_dependencies = ['perl-DBI', 'perl-DBD-mysql'] $repo = {