From 364a224365a58796f2a958b546275e7c21187729 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 24 Jun 2015 18:56:33 +0530 Subject: [PATCH 1/3] Adding support for dependencies as well, to run firfox in headless mode as well --- files/RPM-GPG-KEY-lambda-epll | 19 ++++++++++++++++ files/epll-preview.repo | 41 +++++++++++++++++++++++++++++++++++ files/epll.repo | 41 +++++++++++++++++++++++++++++++++++ manifests/dependencies.pp | 29 +++++++++++++++++++++++++ manifests/params.pp | 2 +- 5 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 files/RPM-GPG-KEY-lambda-epll create mode 100644 files/epll-preview.repo create mode 100644 files/epll.repo create mode 100644 manifests/dependencies.pp diff --git a/files/RPM-GPG-KEY-lambda-epll b/files/RPM-GPG-KEY-lambda-epll new file mode 100644 index 0000000..710521e --- /dev/null +++ b/files/RPM-GPG-KEY-lambda-epll @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQENBFSBCmUBCAC0xAgb7pvxTY0PDDwC+R4tVPgRWWPWOi+okHZveiTYw6+J9gfB +Fw85hNxvXPT+AutLUckbgtx1YQjtgeNTHOh2Kqgs/LtZOmwEWHdM06sxelis7/BU +uGqBS6Rw1E4cZNx9L7QCDJPT2rv28W+N+qXiPymtgl/pvHLWogCxKYN2qpsNdazc +Xt5SatWB0fjScaOrCeTjbuGqz2zhMoBNDjJSHosIvIFK2VJAwM/IhUOiJjEOImUy +oR6r34WOIlMUeB2w00uYs2Osvagoe7soMBu5mYFMvG1195XJHsx1vZg98P/Fs39T +ozUhNVemYI06Mr0AZitHWhHPRtl7ABMkD3OlABEBAAG0QkxhbWJkYSBMaW51eCBF +UExMIChQYWNrYWdlIFNpZ25pbmcgS2V5KSA8c2VjdXJpdHlAbGFtYmRhLWxpbnV4 +LmlvPokBPQQTAQoAJwUCVIEKZQIbAwUJBd7uAAULCQgHAwUVCgkICwUWAgMBAAIe +AQIXgAAKCRAI0eUv94c2pyY9B/0XGylgyLL45WVET1lJ8QeKxmnxmOuboo/sz8LM +uxa9uYPOdQEOpjLBwtm5GgbJMoOAikOPQ5VoPAd3pwsAVeWHBKqqldyCdFAKl52m +o7X9upjw8LBU74T3WJ6nsjRYAxhdJhpZuLtGZRdY/HIvKDv6wE/FY4tsGT6z0Kec +I+PK/Nt8gv2Gjrf0LjGqgHkPG86fWmemgJr79rUp3wg1/T/U6c5tySWa9bUIIawR +e8x74RwLU/sMqztgtQOdAaH2H9g9qpSWWbtp5TfWEJBQpa9uHHyKmRdqC8nrnlZR +WRUspoXUhc9x/UITOJIEayZdOQUa6iKzOt4ymzcnFxB7BfrM +=TDia +-----END PGP PUBLIC KEY BLOCK----- diff --git a/files/epll-preview.repo b/files/epll-preview.repo new file mode 100644 index 0000000..cd5b764 --- /dev/null +++ b/files/epll-preview.repo @@ -0,0 +1,41 @@ +[epll-preview] +name=epll-preview-Base +mirrorlist=http://repo.lambda-linux.io/$releasever/epll-preview/$basearch/os/mirror.list +mirror_expire=300 +metadata_expire=300 +priority=10 +failovermethod=priority +fastestmirror_enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll +enabled=0 +retries=5 +timeout=10 + +[epll-preview-debuginfo] +name=epll-preview-Debuginfo +mirrorlist=http://repo.lambda-linux.io/$releasever/epll-preview/$basearch/Debuginfo/mirror.list +mirror_expire=300 +metadata_expire=300 +priority=10 +failovermethod=priority +fastestmirror_enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll +enabled=0 +retries=5 +timeout=10 + +[epll-preview-source] +name=epll-preview-Source +mirrorlist=http://repo.lambda-linux.io/$releasever/epll-preview/SRPMS/mirror.list +mirror_expire=300 +metadata_expire=300 +priority=10 +failovermethod=priority +fastestmirror_enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll +enabled=0 +retries=5 +timeout=10 diff --git a/files/epll.repo b/files/epll.repo new file mode 100644 index 0000000..a48a3af --- /dev/null +++ b/files/epll.repo @@ -0,0 +1,41 @@ +[epll] +name=epll-Base +mirrorlist=http://repo.lambda-linux.io/$releasever/epll/$basearch/os/mirror.list +mirror_expire=300 +metadata_expire=300 +priority=10 +failovermethod=priority +fastestmirror_enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll +enabled=1 +retries=5 +timeout=10 + +[epll-debuginfo] +name=epll-Debuginfo +mirrorlist=http://repo.lambda-linux.io/$releasever/epll/$basearch/Debuginfo/mirror.list +mirror_expire=300 +metadata_expire=300 +priority=10 +failovermethod=priority +fastestmirror_enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll +enabled=0 +retries=5 +timeout=10 + +[epll-source] +name=epll-Source +mirrorlist=http://repo.lambda-linux.io/$releasever/epll/SRPMS/mirror.list +mirror_expire=300 +metadata_expire=300 +priority=10 +failovermethod=priority +fastestmirror_enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll +enabled=0 +retries=5 +timeout=10 diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp new file mode 100644 index 0000000..c40c3c7 --- /dev/null +++ b/manifests/dependencies.pp @@ -0,0 +1,29 @@ +class firefox::dependencies { + file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/firefox/RPM-GPG-KEY-lambda-epll', + } + file { '/etc/yum.repos.d/epll.repo': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/firefox/epll.repo', + require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], + } + file { '/etc/yum.repos.d/epll-preview.repo': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/firefox/epll-preview.repo', + require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], + } + package { 'firfox-compat': + ensure => installed, + require => File['/etc/yum.repos.d/epll.repo'], + } +} diff --git a/manifests/params.pp b/manifests/params.pp index 36bd6e1..636e3bb 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,7 @@ # Defaut parameter values for the firefox module # -class firefox::params { +class firefox::params inherits firefox::dependencies { $version = '37.0.2' $ensure = present $language = 'en-GB' From 329b2a2b542a411665300070963ae3f00dbe439c Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Wed, 24 Jun 2015 19:56:00 +0530 Subject: [PATCH 2/3] Adding OSfamily check --- manifests/dependencies.pp | 59 ++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp index c40c3c7..344b0f2 100644 --- a/manifests/dependencies.pp +++ b/manifests/dependencies.pp @@ -1,29 +1,36 @@ class firefox::dependencies { - file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll': - ensure => present, - owner => 'root', - group => 'root', - mode => '0644', - source => 'puppet:///modules/firefox/RPM-GPG-KEY-lambda-epll', - } - file { '/etc/yum.repos.d/epll.repo': - ensure => present, - owner => 'root', - group => 'root', - mode => '0644', - source => 'puppet:///modules/firefox/epll.repo', - require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], - } - file { '/etc/yum.repos.d/epll-preview.repo': - ensure => present, - owner => 'root', - group => 'root', - mode => '0644', - source => 'puppet:///modules/firefox/epll-preview.repo', - require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], - } - package { 'firfox-compat': - ensure => installed, - require => File['/etc/yum.repos.d/epll.repo'], + case $::osfamily { + 'RedHat': { + file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/firefox/RPM-GPG-KEY-lambda-epll', + } + file { '/etc/yum.repos.d/epll.repo': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/firefox/epll.repo', + require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], + } + file { '/etc/yum.repos.d/epll-preview.repo': + ensure => present, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/firefox/epll-preview.repo', + require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], + } + package { 'firfox-compat': + ensure => installed, + require => File['/etc/yum.repos.d/epll.repo'], + } + } + default: { + fail("The ${module_name} module is not supported on an ${::osfamily} based system.") + } } } From 30962efb31ecce0f7455c52d18a6578bd3cd5628 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar Date: Thu, 25 Jun 2015 19:38:51 +0530 Subject: [PATCH 3/3] Fixing silly typo --- manifests/dependencies.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/dependencies.pp b/manifests/dependencies.pp index 344b0f2..5b55c76 100644 --- a/manifests/dependencies.pp +++ b/manifests/dependencies.pp @@ -24,7 +24,7 @@ source => 'puppet:///modules/firefox/epll-preview.repo', require => File['/etc/pki/rpm-gpg/RPM-GPG-KEY-lambda-epll'], } - package { 'firfox-compat': + package { 'firefox-compat': ensure => installed, require => File['/etc/yum.repos.d/epll.repo'], }