From 80a3c07b68f74a6f2be14d1b925c17101d50419e Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Mon, 5 Aug 2013 10:38:44 +0200
Subject: [PATCH] Do not touch /etc/hosts anymore + app bugfix

---
 yunohost_app.py   | 6 +++---
 yunohost_tools.py | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/yunohost_app.py b/yunohost_app.py
index f407ac02..1e0e7215 100644
--- a/yunohost_app.py
+++ b/yunohost_app.py
@@ -409,9 +409,6 @@ def app_install(app, domain, path='/', label=None, mode='private'):
                 if app_path in path and app_path.count('/') < path.count('/'):
                     raise YunoHostError(1, _("Unable to install app at this location"))
 
-        if path != '/' and lvl(manifest, 'yunohost', 'webapp', 'domain_root_only') and is_true(manifest['yunohost']['domain_root_only']):
-            raise YunoHostError(1, _("App must be installed to domain root"))
-
 
         ##########################################
         # Fetch or extract sources               #
@@ -425,6 +422,9 @@ def app_install(app, domain, path='/', label=None, mode='private'):
         else:
             manifest = _extract_app_from_file(app)
 
+        if path != '/' and lvl(manifest, 'yunohost', 'webapp', 'domain_root_only') and is_true(manifest['yunohost']['domain_root_only']):
+            raise YunoHostError(1, _("App must be installed to domain root"))
+
 
         #########################################
         # Define App ID & path                  #
diff --git a/yunohost_tools.py b/yunohost_tools.py
index bcd2c2c5..eea3c12b 100644
--- a/yunohost_tools.py
+++ b/yunohost_tools.py
@@ -145,7 +145,6 @@ def tools_maindomain(old_domain, new_domain, dyndns=False):
         '/etc/metronome/metronome.cfg.lua',
         '/etc/dovecot/dovecot.conf',
         '/etc/lemonldap-ng/lemonldap-ng.ini',
-        '/etc/hosts',
         '/usr/share/yunohost/yunohost-config/others/startup',
         '/home/yunohost.backup/tahoe/tahoe.cfg'
     ]
@@ -192,7 +191,6 @@ def tools_maindomain(old_domain, new_domain, dyndns=False):
         'cp /etc/yunohost/apache/templates/admin.fixed.conf /etc/yunohost/apache/domains/' + new_domain + '.d/admin.fixed.conf',
         'cp /etc/yunohost/apache/templates/user.fixed.conf  /etc/yunohost/apache/domains/' + new_domain + '.d/user.fixed.conf',
         '/usr/share/lemonldap-ng/bin/lmYnhMoulinette',
-        '/etc/init.d/hostname.sh',
         'cp    /etc/yunohost/certs/'+ new_domain +'/key.pem /etc/metronome/certs/yunohost_key.pem',
         'chown metronome: /etc/metronome/certs/yunohost_key.pem',
         'ln -s /etc/yunohost/certs/'+ new_domain +'/key.pem /etc/ssl/private/yunohost_key.pem',