YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Do not touch /etc/hosts anymore + app bugfix

Browse source
This commit is contained in:
Kload 2013-08-05 10:38:44 +02:00
parent b6b7a134d6
commit 80a3c07b68
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yunohost_app.py
View file

@ -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('/'): if app_path in path and app_path.count('/') < path.count('/'):
raise YunoHostError(1, _("Unable to install app at this location")) 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 # # Fetch or extract sources #
@ -425,6 +422,9 @@ def app_install(app, domain, path='/', label=None, mode='private'):
else: else:
manifest = _extract_app_from_file(app) 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 # # Define App ID & path #

2
yunohost_tools.py
View file

@ -145,7 +145,6 @@ def tools_maindomain(old_domain, new_domain, dyndns=False):
'/etc/metronome/metronome.cfg.lua', '/etc/metronome/metronome.cfg.lua',
'/etc/dovecot/dovecot.conf', '/etc/dovecot/dovecot.conf',
'/etc/lemonldap-ng/lemonldap-ng.ini', '/etc/lemonldap-ng/lemonldap-ng.ini',
'/etc/hosts',
'/usr/share/yunohost/yunohost-config/others/startup', '/usr/share/yunohost/yunohost-config/others/startup',
'/home/yunohost.backup/tahoe/tahoe.cfg' '/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/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', 'cp /etc/yunohost/apache/templates/user.fixed.conf /etc/yunohost/apache/domains/' + new_domain + '.d/user.fixed.conf',
'/usr/share/lemonldap-ng/bin/lmYnhMoulinette', '/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', 'cp /etc/yunohost/certs/'+ new_domain +'/key.pem /etc/metronome/certs/yunohost_key.pem',
'chown metronome: /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', 'ln -s /etc/yunohost/certs/'+ new_domain +'/key.pem /etc/ssl/private/yunohost_key.pem',