itamae-plugin-recipe-daddy 0.1.28 → 0.1.30

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/client.rb +9 -1
  3. data/lib/itamae/plugin/recipe/daddy/mysql/common.rb +9 -16
  4. data/lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/{mysql-community.repo.erb → mysql-community.rhel-7.repo.erb} +2 -2
  5. data/lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb +34 -0
  6. data/lib/itamae_plugin_recipe_daddy/version.rb +1 -1
  7. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dc22fac5e5908eea956d693d3fa37bead87626228099398470577eae96779794
4
- data.tar.gz: be22bd776fed3e1c9e84d0abbd8cf0976fa59b76cc185b251c6868f5c4132cec
3
+ metadata.gz: 0ef5243a319b90985ac9fe836ce84958c2d3aba97f2a76cfada37fae2fb3e45b
4
+ data.tar.gz: d40e2112058588322048c157e0ede84769e27ea9247ee278317317110fd5b5d3
5
5
  SHA512:
6
- metadata.gz: 721a94ba06aaed2f3ebd9d6c1c06d4a9b38a396c32591f42f235690ea27a358a3becc5d431d21bf55cbb621b2b9c3657e825512cc7fa7a8646014bee1f971452
7
- data.tar.gz: 8898a1b4dbc315c5826e94711a5a9567e45c406639355362a885276142e66cb9fec26ee8b6c781b934e0635f1f05eb918122887913d68224a4da21a727c40251
6
+ metadata.gz: 550a3c7e7881ae9221390963251e36a7174d0cc91b1bd4b28ef5f79cfaeccf8bbd9a4832cb9d80e053bbcd1db2b795521f4c96ed3cc483d235119a7ede7787a7
7
+ data.tar.gz: 0e84ccfca252b3351e6f71cab8eb9fd6bfb1f8030e1505015f62d8a8783b7c24b32957a75f30df39412d2faf1a2c4bdbdbb6fababab00cde74205a2b8a576eff
data/lib/itamae/plugin/recipe/daddy/mysql/client.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  include_recipe 'daddy::mysql::common'
2
2
 
3
3
  case os_version
4
- when /rhel-7\.(.*?)/, /rhel-8\.(.*?)/
4
+ when /rhel-7\.(.*?)/
5
5
  package 'mysql-community-client' do
6
6
  user 'root'
7
7
  end
@@ -9,6 +9,14 @@ when /rhel-7\.(.*?)/, /rhel-8\.(.*?)/
9
9
  package 'mysql-community-devel' do
10
10
  user 'root'
11
11
  end
12
+ when /rhel-8\.(.*?)/
13
+ package 'mysql' do
14
+ user 'root'
15
+ end
16
+
17
+ package 'mysql-devel' do
18
+ user 'root'
19
+ end
12
20
  else
13
21
  raise I18n.t('itamae.errors.unsupported_os_version', os_version: os_version)
14
22
  end
data/lib/itamae/plugin/recipe/daddy/mysql/common.rb CHANGED
@@ -1,23 +1,13 @@
1
1
  require 'daddy/itamae'
2
2
 
3
3
  case os_version
4
- when /rhel-7\.(.*?)/
5
- template '/etc/yum.repos.d/mysql-community.repo' do
6
- user 'root'
7
- owner 'root'
8
- group 'root'
9
- mode '644'
10
- variables enable_57: 1,
11
- enable_80: 0
12
- end
13
- when /rhel-8\.(.*?)/
4
+ when /rhel-7\.(.*?)/, /rhel-8\.(.*?)/
14
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")
15
7
  user 'root'
16
8
  owner 'root'
17
9
  group 'root'
18
10
  mode '644'
19
- variables enable_57: 0,
20
- enable_80: 1
21
11
  end
22
12
  else
23
13
  raise I18n.t('itamae.errors.unsupported_os_version', os_version: os_version)
@@ -36,8 +26,11 @@ execute 'yum clean all' do
36
26
  subscribes :run, "template[/etc/yum.repos.d/mysql-community.repo]", :immediately
37
27
  end
38
28
 
39
- execute 'rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022' do
40
- user 'root'
41
- action :nothing
42
- subscribes :run, "template[/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql]", :immediately
29
+ case os_version
30
+ when /rhel-7\.(.*?)/
31
+ execute 'rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022' do
32
+ user 'root'
33
+ action :nothing
34
+ subscribes :run, "template[/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql]", :immediately
35
+ end
43
36
  end
data/lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/{mysql-community.repo.erb → mysql-community.rhel-7.repo.erb} RENAMED
@@ -18,14 +18,14 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
18
18
  [mysql57-community]
19
19
  name=MySQL 5.7 Community Server
20
20
  baseurl=http://repo.mysql.com/yum/mysql-5.7-community/el/7/$basearch/
21
- enabled=<%= @enable_57 %>
21
+ enabled=1
22
22
  gpgcheck=1
23
23
  gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
24
24
 
25
25
  [mysql80-community]
26
26
  name=MySQL 8.0 Community Server
27
27
  baseurl=http://repo.mysql.com/yum/mysql-8.0-community/el/7/$basearch/
28
- enabled=<%= @enable_80 %>
28
+ enabled=0
29
29
  gpgcheck=1
30
30
  gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
31
31
 
data/lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb ADDED
@@ -0,0 +1,34 @@
1
+ [mysql80-community]
2
+ name=MySQL 8.0 Community Server
3
+ baseurl=http://repo.mysql.com/yum/mysql-8.0-community/el/8/$basearch/
4
+ enabled=1
5
+ gpgcheck=1
6
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
7
+
8
+ [mysql-connectors-community]
9
+ name=MySQL Connectors Community
10
+ baseurl=http://repo.mysql.com/yum/mysql-connectors-community/el/8/$basearch/
11
+ enabled=1
12
+ gpgcheck=1
13
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
14
+
15
+ [mysql-tools-community]
16
+ name=MySQL Tools Community
17
+ baseurl=http://repo.mysql.com/yum/mysql-tools-community/el/8/$basearch/
18
+ enabled=1
19
+ gpgcheck=1
20
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
21
+
22
+ [mysql-tools-preview]
23
+ name=MySQL Tools Preview
24
+ baseurl=http://repo.mysql.com/yum/mysql-tools-preview/el/8/$basearch/
25
+ enabled=0
26
+ gpgcheck=1
27
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
28
+
29
+ [mysql-cluster-8.0-community]
30
+ name=MySQL Cluster 8.0 Community
31
+ baseurl=http://repo.mysql.com/yum/mysql-cluster-8.0-community/el/8/$basearch/
32
+ enabled=0
33
+ gpgcheck=1
34
+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql
data/lib/itamae_plugin_recipe_daddy/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module ItamaePluginRecipeDaddy
2
- VERSION = '0.1.28'
2
+ VERSION = '0.1.30'
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.28
4
+ version: 0.1.30
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-12 00:00:00.000000000 Z
11
+ date: 2025-02-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: itamae
@@ -128,7 +128,8 @@ files:
128
128
  - lib/itamae/plugin/recipe/daddy/mysql/server.rb
129
129
  - lib/itamae/plugin/recipe/daddy/mysql/templates/daddy.cnf.erb
130
130
  - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/pki/rpm-gpg/RPM-GPG-KEY-mysql.erb
131
- - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.repo.erb
131
+ - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-7.repo.erb
132
+ - lib/itamae/plugin/recipe/daddy/mysql/templates/etc/yum.repos.d/mysql-community.rhel-8.repo.erb
132
133
  - lib/itamae/plugin/recipe/daddy/nginx.rb
133
134
  - lib/itamae/plugin/recipe/daddy/nginx/install.rb
134
135
  - lib/itamae/plugin/recipe/daddy/nginx/modules/nginx-rtmp-module.rb