apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweaks for debian system vm

Browse Source
This commit is contained in:
Chiradeep Vittal 2010-09-27 18:04:42 -07:00
parent 0e5469340c
commit f1b0e4b811
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
View File

@ -431,7 +431,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
private void startAdditionalServices() { private void startAdditionalServices() {
Script command = new Script("/bin/bash", s_logger); Script command = new Script("/bin/bash", s_logger);
command.add("-c"); 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(); String result = command.execute();
if (result != null) { if (result != null) {
s_logger.warn("Error in starting sshd service err=" + result ); s_logger.warn("Error in starting sshd service err=" + result );

4
core/src/com/cloud/storage/template/DownloadManagerImpl.java
View File

@ -853,7 +853,7 @@ public class DownloadManagerImpl implements DownloadManager {
Script command = new Script("/bin/bash", s_logger); Script command = new Script("/bin/bash", s_logger);
command.add("-c"); 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(); String result = command.execute();
if (result != null) { if (result != null) {
s_logger.warn("Error in stopping httpd service err=" + result ); 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 = new Script("/bin/bash", s_logger);
command.add("-c"); 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(); result = command.execute();
if (result != null) { if (result != null) {
s_logger.warn("Error in starting httpd service err=" + result ); s_logger.warn("Error in starting httpd service err=" + result );

2
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
View File

@ -140,7 +140,7 @@ public class DownloadMonitorImpl implements DownloadMonitor {
_sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy")); _sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
String cert = configs.get("secstorage.secure.copy.cert"); 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"); s_logger.warn("Only realhostip.com ssl cert is supported, ignoring self-signed and other certs");
} }