From d05b5f04c92034eae1675dc8102247a3cc3315f7 Mon Sep 17 00:00:00 2001 From: baigk Date: Tue, 4 Aug 2015 22:21:43 -0400 Subject: delete the windows newline character JIRA: COMPASS-7 Change-Id: Iffd549877b8cc50a995bdc59adf1f05c0fcb1d5e Signed-off-by: baigk --- deploy/adapters/cobbler/snippets/redhat_register | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'deploy/adapters/cobbler/snippets/redhat_register') diff --git a/deploy/adapters/cobbler/snippets/redhat_register b/deploy/adapters/cobbler/snippets/redhat_register index 966e44f8..3ac0d070 100644 --- a/deploy/adapters/cobbler/snippets/redhat_register +++ b/deploy/adapters/cobbler/snippets/redhat_register @@ -1,18 +1,18 @@ -# begin Red Hat management server registration -#if $redhat_management_type != "off" and $redhat_management_key != "" -mkdir -p /usr/share/rhn/ - #if $redhat_management_type == "site" - #set $mycert_file = "RHN-ORG-TRUSTED-SSL-CERT" - #set $mycert = "/usr/share/rhn/" + $mycert_file -wget http://$redhat_management_server/pub/RHN-ORG-TRUSTED-SSL-CERT -O $mycert -perl -npe 's/RHNS-CA-CERT/$mycert_file/g' -i /etc/sysconfig/rhn/* - #end if - #if $redhat_management_type == "hosted" - #set $mycert = "/usr/share/rhn/RHNS-CA-CERT" - #end if - #set $endpoint = "https://%s/XMLRPC" % $redhat_management_server -rhnreg_ks --serverUrl=$endpoint --sslCACert=$mycert --activationkey=$redhat_management_key -#else -# not configured to register to any Red Hat management server (ok) -#end if -# end Red Hat management server registration +# begin Red Hat management server registration +#if $redhat_management_type != "off" and $redhat_management_key != "" +mkdir -p /usr/share/rhn/ + #if $redhat_management_type == "site" + #set $mycert_file = "RHN-ORG-TRUSTED-SSL-CERT" + #set $mycert = "/usr/share/rhn/" + $mycert_file +wget http://$redhat_management_server/pub/RHN-ORG-TRUSTED-SSL-CERT -O $mycert +perl -npe 's/RHNS-CA-CERT/$mycert_file/g' -i /etc/sysconfig/rhn/* + #end if + #if $redhat_management_type == "hosted" + #set $mycert = "/usr/share/rhn/RHNS-CA-CERT" + #end if + #set $endpoint = "https://%s/XMLRPC" % $redhat_management_server +rhnreg_ks --serverUrl=$endpoint --sslCACert=$mycert --activationkey=$redhat_management_key +#else +# not configured to register to any Red Hat management server (ok) +#end if +# end Red Hat management server registration -- cgit 1.2.3-korg