Skip to content

Commit

Permalink
Deprecate unsupported Solaris platform
Browse files Browse the repository at this point in the history
  • Loading branch information
ghoneycutt committed Jul 8, 2021
1 parent 5454c51 commit 970ae91
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 41 deletions.
2 changes: 0 additions & 2 deletions hiera.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ hierarchy:
# Used to distinguish between Debian and Ubuntu
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
# Used for Solaris
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
- name: "osfamily"
paths:
- "os/%{facts.os.name}.yaml"
Expand Down
27 changes: 0 additions & 27 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -363,33 +363,6 @@
$daemon_dev_package_name = undef
}

'Solaris': {
$client_package_name = 'database/mysql-55/client'
$server_package_name = 'database/mysql-55'
$basedir = undef
$config_file = '/etc/mysql/5.5/my.cnf'
$datadir = '/var/mysql/5.5/data'
$log_error = "/var/mysql/5.5/data/${::hostname}.err"
$pidfile = "/var/mysql/5.5/data/${::hostname}.pid"
$root_group = 'bin'
$server_service_name = 'application/database/mysql:version_55'
$socket = '/tmp/mysql.sock'
$ssl_ca = undef
$ssl_cert = undef
$ssl_key = undef
$tmpdir = '/tmp'
$managed_dirs = undef
# mysql::bindings
$java_package_name = undef
$perl_package_name = undef
$php_package_name = 'web/php-53/extension/php-mysql'
$python_package_name = 'library/python/python-mysql'
$ruby_package_name = undef
# The libraries installed by these packages are included in client and server packages, no installation required.
$client_dev_package_name = undef
$daemon_dev_package_name = undef
}

default: {
case $::operatingsystem {
'Alpine': {
Expand Down
8 changes: 0 additions & 8 deletions templates/mysqlbackup.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ ROTATE=<%= [ Integer(@backuprotate) - 1, 0 ].max %>

# Create temporary mysql cnf file.
TMPFILE=`mktemp /tmp/backup.XXXXXX` || exit 1
<%- if @kernel == 'SunOS' -%>
echo "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE
<%- else -%>
echo -e "[client]\npassword=$PASS\nuser=$USER\nmax_allowed_packet=$MAX_ALLOWED_PACKET" > $TMPFILE
<%- end -%>

<% if @prescript -%>
<%- [@prescript].flatten.compact.each do |script|%>
Expand Down Expand Up @@ -76,11 +72,7 @@ set -o pipefail

cleanup()
{
<%- if @kernel == 'SunOS' -%>
gfind "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | gxargs -0 -r rm -f
<%- else -%>
find "${DIR}/" -maxdepth 1 -type f -name "${PREFIX}*.sql*" -mtime +${ROTATE} -print0 | xargs -0 -r rm -f
<%- end -%>
}

<% if @delete_before_dump -%>
Expand Down
4 changes: 0 additions & 4 deletions templates/xtrabackup.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ set -o pipefail

cleanup()
{
<%- if @kernel == 'SunOS' -%>
gfind "${DIR}/" -mindepth 1 -maxdepth 1 -mtime +${ROTATE} -print0 | gxargs -0 -r rm -rf
<%- else -%>
find "${DIR}/" -mindepth 1 -maxdepth 1 -mtime +${ROTATE} -print0 | xargs -0 -r rm -rf
<%- end -%>
}

<% if @delete_before_dump -%>
Expand Down

0 comments on commit 970ae91

Please sign in to comment.