itamae-plugin-recipe-daddy 0.1.29 → 0.1.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/itamae/plugin/recipe/daddy/mysql/common.rb +42 -18
  3. data/lib/itamae/plugin/recipe/daddy/mysql/server.rb +5 -13
  4. data/lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb +39 -5
  5. data/lib/itamae_plugin_recipe_daddy/version.rb +1 -1
  6. metadata +2 -3
  7. data/lib/itamae/plugin/recipe/daddy/mysql/templates/daddy.cnf.erb +0 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b2b2f51b6c2f38705ea7b45f73a30e1233e1f66f1994764a93ac4b17621abc2f
4
- data.tar.gz: 23c5e880428152a138352ca983b0bd4944ee90dfe79ccaed3a3788704f2d1e70
3
+ metadata.gz: e8c81cd01f5e7dc51ad366463fde72fe5270bf47f240c1c0d22807117dfb1b5b
4
+ data.tar.gz: f0ae871676624677a598f80cdd5acac42203e09f3f9f4cd3102e85261e28a9aa
5
5
  SHA512:
6
- metadata.gz: e54405661bc628266f6249d7c7fbb643187b9a9d0d293f269fea11287f02ac2a3924945196895d6cced39ef1ce283c6cbae429e370135c5e83798e46253408b3
7
- data.tar.gz: a48f0d116f44306645d1b7767ce55f740533bf628e4db9c39434c7e80a2b8af5cc3eabad5ab33ba2e0fdcec76ed010fb8a71b06f2fb8b400d2f848584564bc4c
6
+ metadata.gz: 7eeb09d1539b08a0256fffee2f3a408b17337c92a1c4b6241b029370a532dd2eac53bc828bbe7fed4ff2320b0b3205c62d5fab163826d3a0ab0c8483b72d5a87
7
+ data.tar.gz: ed9e2cbbcb7c21847329f12431090c210d532ea30581099375431017e7da5c83aa9202853c02a0d81a32f8563b33a642f8382fce43013a1079a858d1e0fea82a
data/lib/itamae/plugin/recipe/daddy/mysql/common.rb CHANGED
@@ -1,36 +1,60 @@
1
1
  require 'daddy/itamae'
2
2
 
3
3
  case os_version
4
- when /rhel-7\.(.*?)/, /rhel-8\.(.*?)/
4
+ when /rhel-7\.(.*?)/
5
5
  template '/etc/yum.repos.d/mysql-community.repo' do
6
- source ::File.join(::File.dirname(__FILE__), "templates/etc/yum.repos.d/mysql-community.#{os_version.split('.').first}.repo.erb")
6
+ source ::File.join(::File.dirname(__FILE__), "templates/etc/yum.repos.d/mysql-community.rhel-7.repo.erb")
7
+ user 'root'
8
+ owner 'root'
9
+ group 'root'
10
+ mode '644'
11
+ end
12
+
13
+ template '/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql' do
7
14
  user 'root'
8
15
  owner 'root'
9
16
  group 'root'
10
17
  mode '644'
11
18
  end
12
- else
13
- raise I18n.t('itamae.errors.unsupported_os_version', os_version: os_version)
14
- end
15
19
 
16
- template '/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql' do
17
- user 'root'
18
- owner 'root'
19
- group 'root'
20
- mode '644'
21
- end
20
+ execute 'rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022' do
21
+ user 'root'
22
+ action :nothing
23
+ subscribes :run, "template[/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql]", :immediately
24
+ end
25
+ when /rhel-8\.(.*?)/
26
+ template '/etc/yum.repos.d/mysql-community.repo' do
27
+ source ::File.join(::File.dirname(__FILE__), "templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb")
28
+ user 'root'
29
+ owner 'root'
30
+ group 'root'
31
+ mode '644'
32
+ end
22
33
 
23
- execute 'yum clean all' do
24
- user 'root'
25
- action :nothing
26
- subscribes :run, "template[/etc/yum.repos.d/mysql-community.repo]", :immediately
27
- end
34
+ template '/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql' do
35
+ user 'root'
36
+ owner 'root'
37
+ group 'root'
38
+ mode '644'
39
+ end
28
40
 
29
- case os_version
30
- when /rhel-7\.(.*?)/
31
41
  execute 'rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022' do
32
42
  user 'root'
33
43
  action :nothing
34
44
  subscribes :run, "template[/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql]", :immediately
35
45
  end
46
+
47
+ execute 'dnf -y module disable mysql' do
48
+ user 'root'
49
+ action :nothing
50
+ subscribes :run, "template[/etc/yum.repos.d/mysql-community.repo]", :immediately
51
+ end
52
+ else
53
+ raise I18n.t('itamae.errors.unsupported_os_version', os_version: os_version)
54
+ end
55
+
56
+ execute 'yum clean all' do
57
+ user 'root'
58
+ action :nothing
59
+ subscribes :run, "template[/etc/yum.repos.d/mysql-community.repo]", :immediately
36
60
  end
data/lib/itamae/plugin/recipe/daddy/mysql/server.rb CHANGED
@@ -5,19 +5,11 @@ when /rhel-7\.(.*?)/, /rhel-8\.(.*?)/
5
5
  package 'mysql-community-server' do
6
6
  user 'root'
7
7
  end
8
-
9
- template '/etc/my.cnf.d/daddy.cnf' do
10
- user 'root'
11
- owner 'root'
12
- group 'root'
13
- mode '644'
14
- end
15
-
16
- service 'mysqld' do
17
- user 'root'
18
- action [:enable, :start]
19
- end
20
-
21
8
  else
22
9
  raise I18n.t('itamae.errors.unsupported_os_version', os_version: os_version)
23
10
  end
11
+
12
+ service 'mysqld' do
13
+ user 'root'
14
+ action [:enable, :start]
15
+ end
data/lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb CHANGED
@@ -3,32 +3,66 @@ name=MySQL 8.0 Community Server
3
3
  baseurl=http://repo.mysql.com/yum/mysql-8.0-community/el/8/$basearch/
4
4
  enabled=1
5
5
  gpgcheck=1
6
- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
6
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
7
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
8
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
9
+
10
+ [mysql-innovation-community]
11
+ name=MySQL Innovation Release Community Server
12
+ baseurl=http://repo.mysql.com/yum/mysql-innovation-community/el/8/$basearch
13
+ enabled=0
14
+ gpgcheck=1
15
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
16
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
7
17
 
8
18
  [mysql-connectors-community]
9
19
  name=MySQL Connectors Community
10
20
  baseurl=http://repo.mysql.com/yum/mysql-connectors-community/el/8/$basearch/
11
21
  enabled=1
12
22
  gpgcheck=1
13
- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
23
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
24
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
25
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
14
26
 
15
27
  [mysql-tools-community]
16
28
  name=MySQL Tools Community
17
29
  baseurl=http://repo.mysql.com/yum/mysql-tools-community/el/8/$basearch/
18
30
  enabled=1
19
31
  gpgcheck=1
20
- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
32
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
33
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
34
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
35
+
36
+ [mysql-tools-innovation-community]
37
+ name=MySQL Tools Innovation Community
38
+ baseurl=http://repo.mysql.com/yum/mysql-tools-innovation-community/el/8/$basearch/
39
+ enabled=0
40
+ gpgcheck=1
41
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
42
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
21
43
 
22
44
  [mysql-tools-preview]
23
45
  name=MySQL Tools Preview
24
46
  baseurl=http://repo.mysql.com/yum/mysql-tools-preview/el/8/$basearch/
25
47
  enabled=0
26
48
  gpgcheck=1
27
- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
49
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
50
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
51
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
28
52
 
29
53
  [mysql-cluster-8.0-community]
30
54
  name=MySQL Cluster 8.0 Community
31
55
  baseurl=http://repo.mysql.com/yum/mysql-cluster-8.0-community/el/8/$basearch/
32
56
  enabled=0
33
57
  gpgcheck=1
34
- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
58
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
59
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
60
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
61
+
62
+ [mysql-cluster-innovation-community]
63
+ name=MySQL Cluster Innovation Release Community
64
+ baseurl=http://repo.mysql.com/yum/mysql-cluster-innovation-community/el/8/$basearch
65
+ enabled=0
66
+ gpgcheck=1
67
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2023
68
+ file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022
data/lib/itamae_plugin_recipe_daddy/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module ItamaePluginRecipeDaddy
2
- VERSION = '0.1.29'
2
+ VERSION = '0.1.31'
3
3
 
4
4
  NGINX_VERSION = [
5
5
  NGINX_VERSION_MAJOR = '1',
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: itamae-plugin-recipe-daddy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.29
4
+ version: 0.1.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - ichy
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-02-15 00:00:00.000000000 Z
11
+ date: 2025-05-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: itamae
@@ -126,7 +126,6 @@ files:
126
126
  - lib/itamae/plugin/recipe/daddy/mysql/client.rb
127
127
  - lib/itamae/plugin/recipe/daddy/mysql/common.rb
128
128
  - lib/itamae/plugin/recipe/daddy/mysql/server.rb
129
- - lib/itamae/plugin/recipe/daddy/mysql/templates/daddy.cnf.erb
130
129
  - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql.erb
131
130
  - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-7.repo.erb
132
131
  - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb
data/lib/itamae/plugin/recipe/daddy/mysql/templates/daddy.cnf.erb DELETED
@@ -1,5 +0,0 @@
1
- [mysqld]
2
- character-set-server = utf8
3
-
4
- [mysql]
5
- default-character-set = utf8