paramecio/apache
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes in proxy

Browse source
This commit is contained in:
absurdo 2023-12-03 19:29:43 +01:00
parent a9aab71d12
commit 5a9f6f1ce3
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/webapps/proxy/install_proxy_site.py
View file

@ -56,8 +56,6 @@ if linux_distro!='debian' and linux_distro!='ubuntu':
system_user=getpass.getuser() system_user=getpass.getuser()
name=os.path.basename(home_user[:-1]).strip()
path='/' path='/'
if args.path: if args.path:
@ -73,12 +71,16 @@ if args.path:
if path=='/': if path=='/':
name='proxy'
base_name_file='{}-001-{}.conf'.format(args.domain, name) base_name_file='{}-001-{}.conf'.format(args.domain, name)
name_file='/home/{}/{}-001-{}.conf'.format(system_user, args.domain, name) name_file='/home/{}/{}-001-{}.conf'.format(system_user, args.domain, name)
else: else:
name=os.path.basename(home_user[:-1]).strip()
base_name_file='{}-000-{}.conf'.format(args.domain, name) base_name_file='{}-000-{}.conf'.format(args.domain, name)
name_file='/home/{}/{}-000-{}.conf'.format(system_user, args.domain, name) name_file='/home/{}/{}-000-{}.conf'.format(system_user, args.domain, name)

20
tasks/apache/scripts/delete_app.py
View file

@ -124,7 +124,17 @@ class ServerTask(WebAppTask):
self.code_app=arr_webapp['code'] 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]) self.files.append(['modules/apache/scripts/webapps/delete_app_apache.py', 0o700])
home_user=arr_webapp['home']+'/htdocs/' home_user=arr_webapp['home']+'/htdocs/'
@ -145,7 +155,13 @@ class ServerTask(WebAppTask):
#python3 delete_app_apache.py --domain prueba.cuchulu.com --webapp wordpress #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'])]) self.commands_to_execute.append(['modules/apache/scripts/webapps/delete_app_apache.py', '--domain={} --webapp={}'.format(arr_webapp['domain'], arr_webapp['app_name'])])