From ecaaf01ac1166de80f44a89e5f0910e522bb4f24 Mon Sep 17 00:00:00 2001 From: urihershgc Date: Mon, 7 Dec 2015 16:25:09 +0200 Subject: [PATCH] GC-4552: added certificates and shorter services restart times --- monkey_island/deb-package/DEBIAN/postinst | 2 ++ monkey_island/linux/ubuntu/monkey-island.conf | 2 +- monkey_island/linux/ubuntu/monkey-mongo.conf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/monkey_island/deb-package/DEBIAN/postinst b/monkey_island/deb-package/DEBIAN/postinst index 450c4cfdb..cd65ce8d9 100644 --- a/monkey_island/deb-package/DEBIAN/postinst +++ b/monkey_island/deb-package/DEBIAN/postinst @@ -12,5 +12,7 @@ rm -f $MONKEY_FOLDER/pip_requirements.txt mv $MONKEY_FOLDER/ubuntu/* /etc/init/ +./create_certificate.sh + service monkey-island start service monkey-mongo start diff --git a/monkey_island/linux/ubuntu/monkey-island.conf b/monkey_island/linux/ubuntu/monkey-island.conf index 08c330d22..360559b31 100644 --- a/monkey_island/linux/ubuntu/monkey-island.conf +++ b/monkey_island/linux/ubuntu/monkey-island.conf @@ -13,6 +13,6 @@ end script post-stop script if [ -n $UPSTART_EVENTS ]; then - exec sleep 15 + exec sleep 2 fi end script \ No newline at end of file diff --git a/monkey_island/linux/ubuntu/monkey-mongo.conf b/monkey_island/linux/ubuntu/monkey-mongo.conf index 71abbf27d..df9145014 100644 --- a/monkey_island/linux/ubuntu/monkey-mongo.conf +++ b/monkey_island/linux/ubuntu/monkey-mongo.conf @@ -13,6 +13,6 @@ end script post-stop script if [ -n $UPSTART_EVENTS ]; then - exec sleep 15 + exec sleep 3 fi end script \ No newline at end of file