From f1b0e4b8113225face1edd359c79a0753f4b0064 Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Mon, 27 Sep 2010 18:04:42 -0700 Subject: [PATCH] tweaks for debian system vm --- .../cloud/storage/resource/NfsSecondaryStorageResource.java | 2 +- core/src/com/cloud/storage/template/DownloadManagerImpl.java | 4 ++-- .../src/com/cloud/storage/download/DownloadMonitorImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java index b99d867978f..2051cd07323 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java @@ -431,7 +431,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private void startAdditionalServices() { Script command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("service sshd restart "); + command.add("if [ -f /etc/init.d/ssh ]; then service ssh restart; else service sshd restart; fi "); String result = command.execute(); if (result != null) { s_logger.warn("Error in starting sshd service err=" + result ); diff --git a/core/src/com/cloud/storage/template/DownloadManagerImpl.java b/core/src/com/cloud/storage/template/DownloadManagerImpl.java index 2d37f630fe3..4ca24d102cb 100644 --- a/core/src/com/cloud/storage/template/DownloadManagerImpl.java +++ b/core/src/com/cloud/storage/template/DownloadManagerImpl.java @@ -853,7 +853,7 @@ public class DownloadManagerImpl implements DownloadManager { Script command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("service httpd stop "); + command.add("if [ -d /etc/apache2 ] ; then service apache2 stop; else service httpd stop; fi "); String result = command.execute(); if (result != null) { s_logger.warn("Error in stopping httpd service err=" + result ); @@ -883,7 +883,7 @@ public class DownloadManagerImpl implements DownloadManager { command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("service httpd start "); + command.add("if [ -d /etc/apache2 ] ; then service apache2 start; else service httpd start; fi "); result = command.execute(); if (result != null) { s_logger.warn("Error in starting httpd service err=" + result ); diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index be30a0b0cca..17e97562a78 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -140,7 +140,7 @@ public class DownloadMonitorImpl implements DownloadMonitor { _sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy")); String cert = configs.get("secstorage.secure.copy.cert"); - if ("realhostip.com".equalsIgnoreCase(cert)) { + if (!"realhostip.com".equalsIgnoreCase(cert)) { s_logger.warn("Only realhostip.com ssl cert is supported, ignoring self-signed and other certs"); }