Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mysql-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
mysql-formula
Commits
ccccfd36
Unverified
Commit
ccccfd36
authored
5 years ago
by
Niels Abspoel
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #222 from noelmcloughlin/arch
feat(linux): archlinux support (no osmajorrelase grain)
parents
58b95ba3
4b4ad882
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
mysql/osfamilymap.yaml
+4
-4
4 additions, 4 deletions
mysql/osfamilymap.yaml
mysql/osmap.yaml
+1
-1
1 addition, 1 deletion
mysql/osmap.yaml
mysql/repo.sls
+1
-1
1 addition, 1 deletion
mysql/repo.sls
mysql/server.sls
+1
-1
1 addition, 1 deletion
mysql/server.sls
with
7 additions
and
7 deletions
mysql/osfamilymap.yaml
+
4
−
4
View file @
ccccfd36
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#
#
Debian
:
Debian
:
{
%
if salt
[
'
grains.get'
]
('osmajorrelease')|int >= 9 %
}
{
%
if
'osmajorrelease' in grains and
salt
[
'
grains.get'
]
('osmajorrelease')|int >= 9 %
}
serverpkg
:
mariadb-server
serverpkg
:
mariadb-server
service
:
mariadb
service
:
mariadb
clientpkg
:
mariadb-client
clientpkg
:
mariadb-client
...
@@ -42,13 +42,13 @@ Debian:
...
@@ -42,13 +42,13 @@ Debian:
key_buffer_size
:
16M
key_buffer_size
:
16M
append
:
|
append
:
|
!includedir /etc/mysql/conf.d/
!includedir /etc/mysql/conf.d/
# {% if salt['grains.get']('osmajorrelease')|int >= 9 -%}
# {% if
'osmajorrelease' in grains and
salt['grains.get']('osmajorrelease')|int >= 9 -%}
# !includedir /etc/mysql/mariadb.conf.d/
# !includedir /etc/mysql/mariadb.conf.d/
# {%- endif %}
# {%- endif %}
RedHat
:
RedHat
:
#https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
#https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
{
%
- if salt
[
'
grains.get'
]
('osmajorrelease')|int in
[
7
]
%
}
{
%
- if
'osmajorrelease' in grains and
salt
[
'
grains.get'
]
('osmajorrelease')|int in
[
7
]
%
}
{
%
set fork = 'mariadb' %
}
{
%
set fork = 'mariadb' %
}
serverpkg
:
mariadb-server
serverpkg
:
mariadb-server
service
:
mariadb
service
:
mariadb
...
@@ -75,7 +75,7 @@ RedHat:
...
@@ -75,7 +75,7 @@ RedHat:
Suse
:
Suse
:
serverpkg
:
mariadb
serverpkg
:
mariadb
clientpkg
:
mariadb-client
clientpkg
:
mariadb-client
{
%
- if salt
[
'
grains.get'
]
('osmajorrelease')|int == 42 %
}
{
%
- if
'osmajorrelease' in grains and
salt
[
'
grains.get'
]
('osmajorrelease')|int == 42 %
}
# "old" package name up to Leap 42.x
# "old" package name up to Leap 42.x
pythonpkg
:
python-PyMySQL
pythonpkg
:
python-PyMySQL
{% else %}
{% else %}
...
...
This diff is collapsed.
Click to expand it.
mysql/osmap.yaml
+
1
−
1
View file @
ccccfd36
...
@@ -24,7 +24,7 @@ Ubuntu:
...
@@ -24,7 +24,7 @@ Ubuntu:
CentOS
:
CentOS
:
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
# https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
{
%
- if salt
[
'
grains.get'
]
('osmajorrelease')|int in
[
7
]
%
}
{
%
- if
'osmajorrelease' in grains and
salt
[
'
grains.get'
]
('osmajorrelease')|int in
[
7
]
%
}
{
%
set fork = 'mariadb' %
}
{
%
set fork = 'mariadb' %
}
{
%
set service = 'mariadb' %
}
{
%
set service = 'mariadb' %
}
{
%
- else %
}
{
%
- else %
}
...
...
This diff is collapsed.
Click to expand it.
mysql/repo.sls
+
1
−
1
View file @
ccccfd36
...
@@ -6,7 +6,7 @@ include:
...
@@ -6,7 +6,7 @@ include:
# Completely ignore non-RHEL based systems
# Completely ignore non-RHEL based systems
# TODO: Add Debian and Suse systems.
# TODO: Add Debian and Suse systems.
# TODO: Allow user to specify MySQL version and alter yum repo file accordingly.
# TODO: Allow user to specify MySQL version and alter yum repo file accordingly.
{% if grains['os_family'] == 'RedHat' %}
{% if grains['os_family'] == 'RedHat'
and `osmajorrelease` in grains
%}
{% if grains['osmajorrelease']|int == 5 %}
{% if grains['osmajorrelease']|int == 5 %}
{% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %}
{% set rpm_source = "http://repo.mysql.com/mysql57-community-release-el5.rpm" %}
{% elif grains['osmajorrelease']|int == 6 %}
{% elif grains['osmajorrelease']|int == 6 %}
...
...
This diff is collapsed.
Click to expand it.
mysql/server.sls
+
1
−
1
View file @
ccccfd36
...
@@ -29,7 +29,7 @@ mysql_debconf:
...
@@ -29,7 +29,7 @@ mysql_debconf:
- require:
- require:
- pkg: mysql_debconf_utils
- pkg: mysql_debconf_utils
{% if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %}
{% if
'osmajorrelease' in grains and
salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %}
mysql_password_debconf:
mysql_password_debconf:
debconf.set:
debconf.set:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment