utils/spacewalk-hostname-rename | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 69b9ea77b2bcaaca2caea2db84e770f8e083aaac
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 9 17:53:18 2010 +0200
599030 - check whether SSL certificate generation was successful
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 19fb49e..8d4bc2b 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -282,6 +282,12 @@ function re-generate_server_ssl_certificate {
--password="$SSL_CA_PASSWORD" \
2>>$LOG | grep noarch.rpm`
+ if [ ! -n "$SSL_KEY_PAIR_RPM" ]
+ then
+ echo_err "Wrong SSL information provided. Check $LOG for more information." | tee -a $LOG
+ bye
+ fi
+
if [ -n "$ACTUAL_SSL_KEY_PAIR_PACKAGE" ]
then
echo -n "Removing old SSL certificate ($ACTUAL_SSL_KEY_PAIR_PACKAGE) ... " | tee -a $LOG
commit 5d1fd701e95c17c1da6362b9c946a17df8ff990b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 9 17:28:57 2010 +0200
use hostname as default value for organization unit
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index f6fd787..19fb49e 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -239,7 +239,7 @@ function re-generate_server_ssl_certificate {
else
# offer hostname as ORG UNIT everytime
read -e -p " Enter Organization Unit [$HOSTNAME] : "
- SSL_ORGUNIT=${REPLY:-$SSL_ORGUNIT_OLD}
+ SSL_ORGUNIT=${REPLY:-$HOSTNAME}
fi
# EMAIL ADDRESS
if [ -n "${CML_SSL_EMAIL+x}" ]
commit 7ff7f51f9ff8290815e631749a1f70bef071a43f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jul 14 09:37:00 2010 +0200
enable also VPN IP
take the last parameter
diff --git a/utils/spacewalk-hostname-rename b/utils/spacewalk-hostname-rename
index 032c5df..f6fd787 100755
--- a/utils/spacewalk-hostname-rename
+++ b/utils/spacewalk-hostname-rename
@@ -83,7 +83,7 @@ function print_status {
}
function check_input_ip {
- IPS=`echo $(/sbin/ip a | awk 'BEGIN {FS=" ";RS="/"}; /inet / && ! /127.0./ {print $6}')`
+ IPS=`echo $(/sbin/ip a | awk 'BEGIN {FS=" ";RS="/"}; /inet / && ! /127.0./ {print $NF}')`
for ip in $IPS
do
if [ "$1" == "$ip" ]