Attachment 586707 Details for Bug 803379 – one shot at a better patch

[patch] one shot at a better patch

proposedPatch.patch (text/plain), 2.38 KB, created by wes hayutin on 2012-05-24 21:05:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wes hayutin

Created: 2012-05-24 21:05:56 UTC

Size: 2.38 KB

patch

obsolete

>diff --git a/rhui-2.0/tools/etc/rhui/rhui-tools.conf b/rhui-2.0/tools/etc/rhui/rhui-tools.conf
>index b438ffb..2cc0dda 100644
>--- a/rhui-2.0/tools/etc/rhui/rhui-tools.conf
>+++ b/rhui-2.0/tools/etc/rhui/rhui-tools.conf
>@@ -14,6 +14,7 @@ identity_key:  /etc/pki/rhui/identity.key
> content_ca:   /etc/rhui/cdn.redhat.com-chain.crt
> server_url: https://cdn.redhat.com
> 
>+[yum]
> # Uncomment and set the following attributes to use a proxy to connect to Red Hat.
> # proxy_url:
> # proxy_port:
>diff --git a/rhui-2.0/tools/etc/rhui/templates/rh-rhua-config.spec b/rhui-2.0/tools/etc/rhui/templates/rh-rhua-config.spec
>index 50e35e6..44fb426 100644
>--- a/rhui-2.0/tools/etc/rhui/templates/rh-rhua-config.spec
>+++ b/rhui-2.0/tools/etc/rhui/templates/rh-rhua-config.spec
>@@ -63,6 +63,7 @@ cp -R $RPM_BUILD_DIR/%{name}-%{version}/qpid-nss $RPM_BUILD_ROOT/%{_sysconfdir}/
> # Update the Pulp configuration
> echo "Updating RHUA Server Configuration"
> python /usr/bin/rhui_configurator.py /etc/pulp/pulp.conf !PULP_CONFIGURATOR!
>+python /usr/bin/rhui_configurator.py /etc/rhui/rhui-tools.conf !PULP_CONFIGURATOR!
> 
> #   Substitute in the custom CA certificate
> sed -i -e "s/SSLCACertificateFile.*/SSLCACertificateFile \\/etc\\/pki\\/rhua\\/user-ca-cert.crt/g" /etc/httpd/conf.d/pulp.conf
>@@ -105,11 +106,6 @@ ssl-cert-name=broker # RHUI
> ssl-port=5674 # RHUI
> " >> /etc/qpidd.conf
> 
>-# Update RHUA config files with $HOSTNAME
>-sed -i "s/server_name: localhost/server_name: $HOSTNAME/g" /etc/pulp/pulp.conf
>-sed -i "s/host = localhost.localdomain/host = $HOSTNAME/g" /etc/pulp/consumer/consumer.conf
>-sed -i "s/hostname: localhost/hostname: $HOSTNAME/g" /etc/rhui/rhui-tools.conf
>-
> # Turn on and startup
> /sbin/chkconfig --add pulp-server
> /sbin/chkconfig pulp-server on
>diff --git a/rhui-2.0/tools/src/rhui/rpm/rhua.py b/rhui-2.0/tools/src/rhui/rpm/rhua.py
>index a0fe32a..f657393 100644
>--- a/rhui-2.0/tools/src/rhui/rpm/rhua.py
>+++ b/rhui-2.0/tools/src/rhui/rpm/rhua.py
>@@ -116,6 +116,7 @@ def _create_spec_file(config_dir, answers):
>     # Generate the args to the configurator depending on what the user specified
>     args = [
>             'server', 'server_name', answers['hostname'],
>+            'rhua', 'hostname', answers['hostname'],
>             'messaging', 'url', 'ssl://%s:5674' % answers['hostname'],
>             'messaging', 'cacert', '/etc/pki/rhua/qpid-ca.crt',
>             'messaging', 'clientcert', '/etc/pki/rhua/qpid-client.crt',

Actions: View | Diff

Attachments on bug 803379: 586707 | 601321