tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3496 from Icinga/bugfix/puppet-http-mitm

Browse Source 
Vagrant/Puppet: prevent man-in-the-middle attacks
This commit is contained in:
Eric Lippmann 2018-07-04 09:24:09 +02:00 committed by GitHub
commit 1dce62ee49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.puppet/manifests/puppet.sh
View File

@ -10,7 +10,7 @@ RELEASEVER=$(rpm -q --qf "%{VERSION}" $(rpm -q --whatprovides redhat-release))
case $RELEASEVER in case $RELEASEVER in
6|7) 6|7)
PUPPET="http://yum.puppetlabs.com/puppetlabs-release-el-${RELEASEVER}.noarch.rpm" PUPPET="https://yum.puppetlabs.com/puppetlabs-release-el-${RELEASEVER}.noarch.rpm"
;; ;;
*) *)
echo "Unknown release version: $RELEASEVER" >&2 echo "Unknown release version: $RELEASEVER" >&2

12
.puppet/modules/epel/manifests/init.pp
View File

@ -13,12 +13,12 @@
# include epel # include epel
# #
class epel { class epel {
exec { 'rpm --import RPM-GPG-KEY-EPEL':
yumrepo { 'epel': command => '/bin/rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
mirrorlist => "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-${::operatingsystemmajrelease}&arch=${::architecture}", }
enabled => '1', -> exec { 'yum install epel-release-latest':
gpgcheck => '0', command => '/bin/yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm',
descr => "Extra Packages for Enterprise Linux ${::operatingsystemmajrelease} - ${::architecture}" creates => '/etc/yum.repos.d/epel.repo',
} }
} }

4
.puppet/modules/icinga_packages/manifests/init.pp
View File

@ -8,10 +8,10 @@
# #
class icinga_packages { class icinga_packages {
yumrepo { 'icinga_packages': yumrepo { 'icinga_packages':
baseurl => "http://packages.icinga.com/epel/${::operatingsystemmajrelease}/snapshot/", baseurl => "https://packages.icinga.com/epel/${::operatingsystemmajrelease}/snapshot/",
enabled => '1', enabled => '1',
gpgcheck => '1', gpgcheck => '1',
gpgkey => 'http://packages.icinga.com/icinga.key', gpgkey => 'https://packages.icinga.com/icinga.key',
descr => "Icinga Repository - ${::architecture}" descr => "Icinga Repository - ${::architecture}"
} }
} }