integ/config/puppet-modules/puppet-rabbitmq-5.5.0/centos/patches/0002-Changed-cipher-specification-to-openssl-format.patch
Scott Little bab9bb6b69 Internal restructuring of stx-integ
Create new directories:
   ceph
   config
   config-files
   filesystem
   kernel
   kernel/kernel-modules
   ldap
   logging
   strorage-drivers
   tools
   utilities
   virt

Retire directories:
   connectivity
   core
   devtools
   support
   extended

Delete two packages:
   tgt
   irqbalance

Relocated packages:
   base/
      dhcp
      initscripts
      libevent
      lighttpd
      linuxptp
      memcached
      net-snmp
      novnc
      ntp
      openssh
      pam
      procps
      sanlock
      shadow
      sudo
      systemd
      util-linux
      vim
      watchdog

   ceph/
      python-cephclient

   config/
      facter
      puppet-4.8.2
      puppet-modules

   filesystem/
      e2fsprogs
      nfs-utils
      nfscheck

   kernel/
      kernel-std
      kernel-rt

   kernel/kernel-modules/
      mlnx-ofa_kernel

   ldap/
      nss-pam-ldapd
      openldap

   logging/
      syslog-ng
      logrotate

   networking/
      lldpd
      iproute
      mellanox
      python-ryu
      mlx4-config

   python/
      python-2.7.5
      python-django
      python-gunicorn
      python-setuptools
      python-smartpm
      python-voluptuous

   security/
      shim-signed
      shim-unsigned
      tboot

   strorage-drivers/
      python-3parclient
      python-lefthandclient

   virt/
      cloud-init
      libvirt
      libvirt-python
      qemu

   tools/
      storage-topology
      vm-topology

   utilities/
      tis-extensions
      namespace-utils
      nova-utils
      update-motd

Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
2018-08-01 10:06:31 -04:00

36 lines
1.4 KiB
Diff

From c6a94f3bbc69d82c74cc597b6b7b1fe5813b0537 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 2 Nov 2017 09:22:58 -0500
Subject: [PATCH 2/2] WRS: Patch2:
0002-Changed-cipher-specification-to-openssl-format.patch
---
templates/rabbitmq.config.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/rabbitmq.config.erb b/templates/rabbitmq.config.erb
index cf2a388..b9612f3 100644
--- a/templates/rabbitmq.config.erb
+++ b/templates/rabbitmq.config.erb
@@ -72,7 +72,7 @@
<%- end -%>
<%- if @ssl_ciphers and @ssl_ciphers.size > 0 -%>
,{ciphers,[
- <%= @ssl_ciphers.sort.map{|k| "{#{k}}"}.join(",\n ") %>
+ <%= @ssl_ciphers.sort.map{|k| "\"#{k}\""}.join(",\n ") %>
]}
<%- end -%>
]},
@@ -111,7 +111,7 @@
<%- end -%>
<%- if @ssl_ciphers and @ssl_ciphers.size > 0 -%>
,{ciphers,[
- <%= @ssl_ciphers.sort.map{|k| "{#{k}}"}.join(",\n ") %>
+ <%= @ssl_ciphers.sort.map{|k| "\"#{k}\""}.join(",\n ") %>
]}
<%- end -%>
]}
--
1.8.3.1