Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add some fact checks to not add php5.6 repo to new alma/redhat system… #720

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions manifests/repo/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,27 @@
default => '$releasever', # Yum var
}

$basearch = $facts['architecture'] ? {

Check warning on line 17 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

legacy fact 'architecture' (check: legacy_facts)
default => '$basearch', # Yum var
}

yumrepo { 'remi':
descr => 'Remi\'s RPM repository for Enterprise Linux $releasever - $basearch',
mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/remi/mirror",
mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/remi/${basearch}/mirror",
enabled => 1,
gpgcheck => 1,
gpgkey => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi',
priority => 1,
}

if (! ($facts['os']['name'] in ['AlmaLinux','Redhat'])) and ($facts['distro']['major'] in ['8','9']) {

Check failure on line 30 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

there should be a single space before an opening brace (check: manifest_whitespace_opening_brace_before)

Check warning on line 30 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 2 chars and is 0 (check: strict_indent)
yumrepo { 'remi-php56':

Check warning on line 31 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 4 chars and is 2 (check: strict_indent)
descr => 'Remi\'s PHP 5.6 RPM repository for Enterprise Linux $releasever - $basearch',

Check warning on line 32 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 4 (check: strict_indent)
mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/php56/mirror",
mirrorlist => "https://rpms.remirepo.net/enterprise/${releasever}/php56/${basearch}/mirror",

Check warning on line 33 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 4 (check: strict_indent)
enabled => 1,

Check warning on line 34 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 4 (check: strict_indent)
gpgcheck => 1,

Check warning on line 35 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 4 (check: strict_indent)
gpgkey => 'https://rpms.remirepo.net/RPM-GPG-KEY-remi2023',

Check warning on line 36 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 4 (check: strict_indent)
priority => 1,

Check warning on line 37 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 6 chars and is 4 (check: strict_indent)
}

Check warning on line 38 in manifests/repo/redhat.pp

View workflow job for this annotation

GitHub Actions / Puppet / Static validations

indent should be 4 chars and is 2 (check: strict_indent)
}
}
Loading