From a68b6ebc3da25a52ba94672922db26a1a33d25b5 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 20 Nov 2013 20:59:40 +0200 Subject: [PATCH] check if old scheme is used --- upd/{convert-templates.sh => convert_templates.sh} | 0 upd/convert_webip.sh | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) rename upd/{convert-templates.sh => convert_templates.sh} (100%) diff --git a/upd/convert-templates.sh b/upd/convert_templates.sh similarity index 100% rename from upd/convert-templates.sh rename to upd/convert_templates.sh diff --git a/upd/convert_webip.sh b/upd/convert_webip.sh index 210b5a994..2df378e02 100755 --- a/upd/convert_webip.sh +++ b/upd/convert_webip.sh @@ -3,7 +3,13 @@ # Include vesta.conf source /usr/local/vesta/conf/vesta.conf -# Remove ol ip definitions from vesta.conf +# Check if old scheme is in use +check_oldip=$(grep "^Listen" /etc/$WEB_SYSTEM/conf.d/vesta.conf) +if [ -z "$check_oldip" ]; then + exit +fi + +# Remove old ip definitions from vesta.conf sed -i "/^Listen/d" /etc/$WEB_SYSTEM/conf.d/vesta.conf sed -i "/^NameVirtualHost/d" /etc/$WEB_SYSTEM/conf.d/vesta.conf sed -i "/^$/d" /etc/$WEB_SYSTEM/conf.d/vesta.conf