This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b502b7987fee3f9d57379206f05d4d804e67c869 Author: Rohit Yadav <[email protected]> AuthorDate: Thu Nov 30 23:24:15 2017 +0530 fix failures seen in ssvm Signed-off-by: Rohit Yadav <[email protected]> --- developer/developer-prefill.sql | 2 +- setup/dev/advanced.cfg | 2 +- systemvm/agent/scripts/config_ssl.sh | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/developer/developer-prefill.sql b/developer/developer-prefill.sql index cc67748..c9ab468 100644 --- a/developer/developer-prefill.sql +++ b/developer/developer-prefill.sql @@ -112,7 +112,7 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value) INSERT INTO `cloud`.`configuration` (category, instance, component, name, value) VALUES ('Advanced', 'DEFAULT', 'management-server', - 'ping.timeout', '1.5'); + 'ping.timeout', '2.0'); -- Enable dynamic RBAC by default for fresh deployments INSERT INTO `cloud`.`configuration` (category, instance, component, name, value) diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg index bdb25e5..d5762c3 100644 --- a/setup/dev/advanced.cfg +++ b/setup/dev/advanced.cfg @@ -231,7 +231,7 @@ }, { "name": "ping.timeout", - "value": "1.5" + "value": "2.0" } ], "mgtSvr": [ diff --git a/systemvm/agent/scripts/config_ssl.sh b/systemvm/agent/scripts/config_ssl.sh index d8e1b9d..b8cf47c 100755 --- a/systemvm/agent/scripts/config_ssl.sh +++ b/systemvm/agent/scripts/config_ssl.sh @@ -47,8 +47,6 @@ config_apache2_conf() { cp -f /etc/apache2/sites-available/default-ssl.orig /etc/apache2/sites-available/default-ssl sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:80>/" /etc/apache2/sites-available/default sed -i -e "s/<VirtualHost.*>/<VirtualHost $ip:443>/" /etc/apache2/sites-available/default-ssl - sed -i -e "s/Listen .*:80/Listen $ip:80/g" /etc/apache2/ports.conf - sed -i -e "s/Listen .*:443/Listen $ip:443/g" /etc/apache2/ports.conf sed -i 's/ssl-cert-snakeoil.key/cert_apache.key/' /etc/apache2/sites-available/default-ssl sed -i 's/ssl-cert-snakeoil.pem/cert_apache.crt/' /etc/apache2/sites-available/default-ssl sed -i 's/SSLProtocol.*$/SSLProtocol all -SSLv2 -SSLv3/' /etc/apache2/sites-available/default-ssl @@ -208,8 +206,7 @@ fi if [ -d /etc/apache2 ] then config_apache2_conf $publicIp $hostName - /etc/init.d/apache2 stop - /etc/init.d/apache2 start + systemctl restart apache2 else config_httpd_conf $publicIp $hostName fi -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
