From 22164c0f83f07ee4089058409d50a12fd7d376ef Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 21 Nov 2012 23:35:52 +0100 Subject: add ip rubygem --- manifests/ip.pp | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 manifests/ip.pp diff --git a/manifests/ip.pp b/manifests/ip.pp new file mode 100644 index 0000000..190d869 --- /dev/null +++ b/manifests/ip.pp @@ -0,0 +1,7 @@ +class rubygems::ip { + require rubygems + package{'ip': + ensure => present, + provider => gem, + } +} -- cgit v1.2.3 From 9d1dea86c8826bfb6b6cc9421ba97cdf87084a19 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 23 Nov 2012 17:11:00 +0100 Subject: add new gems --- manifests/sinatra.pp | 7 +++++++ manifests/thin.pp | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 manifests/sinatra.pp create mode 100644 manifests/thin.pp diff --git a/manifests/sinatra.pp b/manifests/sinatra.pp new file mode 100644 index 0000000..327f829 --- /dev/null +++ b/manifests/sinatra.pp @@ -0,0 +1,7 @@ +class rubygems::sinatra { + require rubygems + package{'sinatra': + ensure => present, + provider => gem, + } +} diff --git a/manifests/thin.pp b/manifests/thin.pp new file mode 100644 index 0000000..b2499d8 --- /dev/null +++ b/manifests/thin.pp @@ -0,0 +1,7 @@ +class rubygems::thin { + require rubygems + package{'thin': + ensure => present, + provider => gem, + } +} -- cgit v1.2.3 From 18dc5a99283a0b2c9a448fcd43c906e7ff173abd Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 27 Aug 2013 14:52:55 +0200 Subject: fix topscope variable --- manifests/postgres.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/postgres.pp b/manifests/postgres.pp index 00f09be..d2c967b 100644 --- a/manifests/postgres.pp +++ b/manifests/postgres.pp @@ -1,5 +1,5 @@ class rubygems::postgres { - if $operatingsystem == 'CentOS' and $lsbmajdistrelease > 5 { + if $::operatingsystem == 'CentOS' and $::lsbmajdistrelease > 5 { package{'rubygem-pg': ensure => installed, } -- cgit v1.2.3 From 535bb09801beca535d805eedc97351815dc6c2e5 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 9 Jul 2014 23:23:49 +0200 Subject: get rid off lsb facts --- manifests/postgres.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/postgres.pp b/manifests/postgres.pp index d2c967b..f43c360 100644 --- a/manifests/postgres.pp +++ b/manifests/postgres.pp @@ -1,5 +1,5 @@ class rubygems::postgres { - if $::operatingsystem == 'CentOS' and $::lsbmajdistrelease > 5 { + if $::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > 5 { package{'rubygem-pg': ensure => installed, } -- cgit v1.2.3 From d2a11bef1b2ef45e97a324e6ce30e3974ed97e38 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 28 Dec 2014 13:15:36 +0100 Subject: make it el7 ready --- manifests/xmlsimple.pp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/manifests/xmlsimple.pp b/manifests/xmlsimple.pp index 0e3e3a8..1819f77 100644 --- a/manifests/xmlsimple.pp +++ b/manifests/xmlsimple.pp @@ -1,3 +1,4 @@ +# xml simple lib class rubygems::xmlsimple { package{'rubygem-xml-simple': ensure => present, @@ -9,4 +10,11 @@ class rubygems::xmlsimple { } } } + if $::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > 6 { + # not yet packaged + Package['rubygem-xml-simple']{ + name => 'xml-simple', + provider => gem, + } + } } -- cgit v1.2.3 From 0df73b6128184faca333561ea67c7d05701a1d79 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 28 Dec 2014 13:16:10 +0100 Subject: linting --- manifests/xmlsimple.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/xmlsimple.pp b/manifests/xmlsimple.pp index 1819f77..7b00204 100644 --- a/manifests/xmlsimple.pp +++ b/manifests/xmlsimple.pp @@ -3,7 +3,7 @@ class rubygems::xmlsimple { package{'rubygem-xml-simple': ensure => present, } - case $operatingsystem { + case $::operatingsystem { debian,ubuntu: { Package['rubygem-xml-simple']{ name => 'libxml-simple-ruby' -- cgit v1.2.3 From ff58f198b3fb58e8ae6e7fe058c8fa18aa11f937 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 26 Jun 2015 14:01:17 +0200 Subject: modernize the module --- manifests/bcrypt.pp | 15 +++++++++++---- manifests/mail.pp | 22 +++++++++++++++------- manifests/maildir.pp | 16 ++++++++++++---- manifests/postgres.pp | 3 ++- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/manifests/bcrypt.pp b/manifests/bcrypt.pp index 93bd9b0..e83bc66 100644 --- a/manifests/bcrypt.pp +++ b/manifests/bcrypt.pp @@ -1,7 +1,14 @@ class rubygems::bcrypt { - require rubygems - package{'bcrypt-ruby': - ensure => present, - provider => gem, + if ($::osfamily == 'RedHat') and + versioncmp($::operatingsystemmajrelease,'6') > 0 { + package{'rubygem-bcrypt': + ensure => present, + } + } else { + require rubygems + package{'bcrypt-ruby': + ensure => present, + provider => gem, + } } } diff --git a/manifests/mail.pp b/manifests/mail.pp index 4afa0c7..17de50e 100644 --- a/manifests/mail.pp +++ b/manifests/mail.pp @@ -1,11 +1,19 @@ +# manage the mail rubygem class rubygems::mail { - require rubygems::devel - package{'mail': - ensure => present, - provider => gem, - } + if ($::osfamily == 'RedHat') and + versioncmp($::operatingsystemmajrelease,'6') > 0 { + package{'rubygem-mail': + ensure => present, + } + } else { + require rubygems::devel + package{'mail': + ensure => present, + provider => gem, + } - if $rubyversion == '1.8.6' { - require rubygems::tlsmail + if $::rubyversion == '1.8.6' { + require rubygems::tlsmail + } } } diff --git a/manifests/maildir.pp b/manifests/maildir.pp index 1bdcc05..14bbc62 100644 --- a/manifests/maildir.pp +++ b/manifests/maildir.pp @@ -1,7 +1,15 @@ +# manage maildir rubygem class rubygems::maildir { - require rubygems::devel - package{'maildir': - ensure => present, - provider => gem, + if ($::osfamily == 'RedHat') and + versioncmp($::operatingsystemmajrelease,'6') > 0 { + package{'rubygem-maildir': + ensure => present, + } + } else { + require rubygems::devel + package{'maildir': + ensure => present, + provider => gem, + } } } diff --git a/manifests/postgres.pp b/manifests/postgres.pp index f43c360..af7c563 100644 --- a/manifests/postgres.pp +++ b/manifests/postgres.pp @@ -1,5 +1,6 @@ class rubygems::postgres { - if $::operatingsystem == 'CentOS' and $::operatingsystemmajrelease > 5 { + if $::osfamily == 'RedHat' and + versioncmp($::operatingsystemmajrelease,'5') > 0 { package{'rubygem-pg': ensure => installed, } -- cgit v1.2.3 From c596f10baf5da5e025fdf3eea54a425c27f79b11 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 8 Jan 2016 13:42:38 +0100 Subject: no need to install rubygems anymore --- manifests/init.pp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 678bd54..0585994 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,7 +14,10 @@ # class rubygems { - package{'rubygems': - ensure => installed, + # from debian 8 on this is not anymore needed + if ($::operatingsystem != 'Debian') or (versioncmp($::operatingsystemmajrelease,'8') < 0) { + package{'rubygems': + ensure => installed, + } } } -- cgit v1.2.3 From 72b32ac5fe67d931aa3bf4ba19ab8dcde7a23c01 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 8 Jan 2016 13:43:30 +0100 Subject: clarify documentation --- manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 0585994..40308cb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,8 +13,9 @@ # the Free Software Foundation. # +# manage rubygems basics class rubygems { - # from debian 8 on this is not anymore needed + # from debian 8 on this is not anymore needed as it's part of the ruby pkg if ($::operatingsystem != 'Debian') or (versioncmp($::operatingsystemmajrelease,'8') < 0) { package{'rubygems': ensure => installed, -- cgit v1.2.3