From 16da07772d3a412ee9a1bd85fa96b152b92c562a Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Thu, 17 Oct 2013 10:23:34 +0200
Subject: [PATCH] Update yunohost.conf

---
 autoinstall_yunohostv2 | 10 ++++------
 install_yunohostv2     | 12 +++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/autoinstall_yunohostv2 b/autoinstall_yunohostv2
index 74de1c9..2b08917 100755
--- a/autoinstall_yunohostv2
+++ b/autoinstall_yunohostv2
@@ -49,18 +49,16 @@ cat << EOF > /etc/yunohost/yunohost.conf
 #to enable yunohost custom config change no by yes
 
 amavis=no
-nginx=no
 dovecot=no
 iptables=no
-ssowat=no
+metronome=no
+mysql=no
+nginx=no
 postfix=no
-proftpd=no
-radicale=no
 samba=no
 slapd=no
 ssh=yes
-mysql=no
-prosody=no
+ssowat=no
 EOF
 fi
 
diff --git a/install_yunohostv2 b/install_yunohostv2
index 23814f3..b6362e2 100755
--- a/install_yunohostv2
+++ b/install_yunohostv2
@@ -50,18 +50,16 @@ cat << EOF > /etc/yunohost/yunohost.conf
 #to enable yunohost custom config change no by yes
 
 amavis=no
-nginx=no
 dovecot=no
 iptables=no
-ssowat=no
+metronome=no
+mysql=no
+nginx=no
 postfix=no
-proftpd=no
-radicale=no
 samba=no
 slapd=no
 ssh=yes
-mysql=no
-prosody=no
+ssowat=no
 EOF
 fi
 
@@ -73,7 +71,7 @@ then
     DOMAIN='yunohost.org'
 fi
 
-whiptail --title "Yunohost Installation" --yesno "Caution : your config files for postfix,dovecot,mysql,apache,prosody,radicale will be overwritten\nDo you want to proceed install of Yunohost?" 8 78
+whiptail --title "Yunohost Installation" --yesno "Caution : your config files for postfix,dovecot,mysql,nginx,metronome will be overwritten\nDo you want to proceed install of Yunohost?" 8 78
 YESNO=$?
 
 if [[ $YESNO -eq 0 ]]