components/ruby/puppet-modules/puppetlabs-rabbitmq/patches/05-rabbitmqadmin-usr-local.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
child 5860 afd31ba91ee9
equal deleted inserted replaced
6016:a477397bba8b 6035:c9748fcc32de
       
     1 In-house patch to have the rabbitmq providers look in /usr/bin for
       
     2 rabbitmqadmin instead of /usr/local/bin
       
     3 
       
     4 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb.orig  2015-11-20 07:01:01.498398940 -0800
       
     5 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb    2015-11-20 07:01:14.230495648 -0800
       
     6 @@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_binding).pro
       
     7 
       
     8    if Puppet::PUPPETVERSION.to_f < 3
       
     9      commands :rabbitmqctl   => 'rabbitmqctl'
       
    10 -    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
       
    11 +    commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin'
       
    12    else
       
    13      has_command(:rabbitmqctl, 'rabbitmqctl') do
       
    14        environment :HOME => "/tmp"
       
    15      end
       
    16 -    has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
       
    17 +    has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do
       
    18        environment :HOME => "/tmp"
       
    19      end
       
    20    end
       
    21 
       
    22 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb.orig  2015-11-20 07:29:19.574821579 -0800
       
    23 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb    2015-11-20 07:29:25.845150783 -0800
       
    24 @@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_exchange).pr
       
    25 
       
    26    if Puppet::PUPPETVERSION.to_f < 3
       
    27      commands :rabbitmqctl   => 'rabbitmqctl'
       
    28 -    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
       
    29 +    commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin'
       
    30    else
       
    31      has_command(:rabbitmqctl, 'rabbitmqctl') do
       
    32        environment :HOME => "/tmp"
       
    33      end
       
    34 -    has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
       
    35 +    has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do
       
    36        environment :HOME => "/tmp"
       
    37      end
       
    38    end
       
    39 
       
    40 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb.orig  2015-11-20 07:30:21.622578483 -0800
       
    41 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb    2015-11-20 07:30:26.940673078 -0800
       
    42 @@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_queue).provi
       
    43 
       
    44    if Puppet::PUPPETVERSION.to_f < 3
       
    45      commands :rabbitmqctl   => 'rabbitmqctl'
       
    46 -    commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin'
       
    47 +    commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin'
       
    48    else
       
    49      has_command(:rabbitmqctl, 'rabbitmqctl') do
       
    50        environment :HOME => "/tmp"
       
    51      end
       
    52 -    has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do
       
    53 +    has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do
       
    54        environment :HOME => "/tmp"
       
    55      end
       
    56    end