diff --git a/scripts/webapps/proxy/install_proxy_site.py b/scripts/webapps/proxy/install_proxy_site.py index c6eb241..00cbcfa 100644 --- a/scripts/webapps/proxy/install_proxy_site.py +++ b/scripts/webapps/proxy/install_proxy_site.py @@ -56,8 +56,6 @@ if linux_distro!='debian' and linux_distro!='ubuntu': system_user=getpass.getuser() -name=os.path.basename(home_user[:-1]).strip() - path='/' if args.path: @@ -73,12 +71,16 @@ if args.path: if path=='/': + name='proxy' + base_name_file='{}-001-{}.conf'.format(args.domain, name) name_file='/home/{}/{}-001-{}.conf'.format(system_user, args.domain, name) else: + name=os.path.basename(home_user[:-1]).strip() + base_name_file='{}-000-{}.conf'.format(args.domain, name) name_file='/home/{}/{}-000-{}.conf'.format(system_user, args.domain, name) diff --git a/tasks/apache/scripts/delete_app.py b/tasks/apache/scripts/delete_app.py index 4643443..43ea4f3 100644 --- a/tasks/apache/scripts/delete_app.py +++ b/tasks/apache/scripts/delete_app.py @@ -124,7 +124,17 @@ class ServerTask(WebAppTask): self.code_app=arr_webapp['code'] - self.files.append(['modules/apache/scripts/webapps/'+arr_webapp['app_type']+'/delete_'+arr_webapp['app_type']+'.py', 0o700]) + py_file='modules/apache/scripts/webapps/'+arr_webapp['app_type']+'/delete_'+arr_webapp['app_type']+'.py' + php_file='modules/apache/scripts/webapps/'+arr_webapp['app_type']+'/delete_'+arr_webapp['app_type']+'.php' + + if os.path.isfile(py_file): + + self.files.append([py_file, 0o700]) + + else: + + self.files.append([php_file, 0o700]) + self.files.append(['modules/apache/scripts/webapps/delete_app_apache.py', 0o700]) home_user=arr_webapp['home']+'/htdocs/' @@ -145,7 +155,13 @@ class ServerTask(WebAppTask): #python3 delete_app_apache.py --domain prueba.cuchulu.com --webapp wordpress - self.commands_to_execute.append(['modules/apache/scripts/webapps/'+arr_webapp['app_type']+'/delete_'+arr_webapp['app_type']+'.py', '--user=%s --home_user=%s %s' % (arr_webapp['username'], home_user, db_opts)]) + if os.path.isfile(py_file): + + self.commands_to_execute.append(['modules/apache/scripts/webapps/'+arr_webapp['app_type']+'/delete_'+arr_webapp['app_type']+'.py', '--user=%s --home_user=%s %s' % (arr_webapp['username'], home_user, db_opts)]) + + else: + + self.commands_to_execute.append(['php modules/apache/scripts/webapps/'+arr_webapp['app_type']+'/delete_'+arr_webapp['app_type']+'.php', '--user=%s --home_user=%s %s' % (arr_webapp['username'], home_user, db_opts)]) self.commands_to_execute.append(['modules/apache/scripts/webapps/delete_app_apache.py', '--domain={} --webapp={}'.format(arr_webapp['domain'], arr_webapp['app_name'])])