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

Fixes in proxy virtualhost

Browse source
This commit is contained in:
absurdo 2023-12-14 23:51:40 +01:00
parent b2b879c3f8
commit d3d041f569
9 changed files with 84 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/webapps/delete_app_apache.py
View file

@ -48,9 +48,9 @@ if os.path.isfile(apache_php):
apache_webapp='/etc/{}/vhosts.d/extra/{}-{}.conf'.format(apache_cmd, args.domain, args.webapp)
apache_sub0_webapp='/etc/{}/vhosts.d/extra/{}-000-{}.conf'.format(apache_cmd, args.domain, args.webapp)
apache_sub0_webapp='/etc/{}/vhosts.d/extra/proxy/{}-{}.conf'.format(apache_cmd, args.domain, args.webapp)
apache_sub1_webapp='/etc/{}/vhosts.d/extra/{}-001-{}.conf'.format(apache_cmd, args.domain, args.webapp)
apache_sub1_webapp='/etc/{}/vhosts.d/extra/proxyphp/{}-{}.conf'.format(apache_cmd, args.domain, args.webapp)
if os.path.isfile(apache_webapp):
if subprocess.call("sudo rm %s" % (apache_webapp), shell=True) > 0:

6
scripts/webapps/flask/delete_flask.py
View file

@ -35,9 +35,11 @@ name_service=os.path.basename(home_user[:-1]).strip()
domain=os.path.basename(home_user[:-1].replace(name_service, '')[:-1]).strip()
if home_user.find('/htdocs/', -8)!=-1:
home_user=home_user.replace('htdocs', 'flask')
if name_service=='htdocs':
name_service='flask'
#home_user=home_user.replace('flask', 'htdocs')
#print(domain)
@ -45,7 +47,7 @@ if subprocess.call('sudo systemctl stop %s-%s.service && sudo rm /etc/systemd/sy
print('Error: cannot delete app service in systemd...')
sys.exit(1)
if subprocess.call("sudo su %s -s /bin/bash -c 'rm -f -r %s'" % (args.user, args.home_user), shell=True) > 0:
if subprocess.call("sudo su %s -s /bin/bash -c 'rm -f -r %s'" % (args.user, home_user), shell=True) > 0:
print('Error: cannot delete %s' % args.home_user)
sys.exit(1)

11
scripts/webapps/flask/install_flask_site.py
View file

@ -148,12 +148,14 @@ if subprocess.call("sudo su %s -s /bin/bash -c 'git clone %s %sapp && cd %sapp &
sys.exit(1)
if path=='/':
base_name_file='{}-001-{}.conf'.format(args.domain, name)
base_name_file='{}-{}.conf'.format(args.domain, name)
else:
base_name_file='{}-000-{}.conf'.format(args.domain, name)
base_name_file='{}-{}.conf'.format(args.domain, name)
name_file='/home/{}/{}'.format(system_user, base_name_file)
apache_path='/proxy'
with open(name_file, 'w') as f:
f.write("ProxyPreserveHost On\n")
@ -177,9 +179,12 @@ with open(name_file, 'w') as f:
f.write("ProxyPass !\n")
f.write("</Location>\n")
else:
apache_path=''
print('Updating apache configuration for flask outside of htdocs...')
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra && sudo chown root:root /etc/{}/vhosts.d/extra/{}'.format(name_file, apache_cmd, apache_cmd, base_name_file), shell=True) > 0:
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra{} && sudo chown root:root /etc/{}/vhosts.d/extra{}/{}'.format(name_file, apache_cmd, apache_path, apache_cmd, apache_path, base_name_file), shell=True) > 0:
print('Error')
sys.exit(1)

8
scripts/webapps/phpmyadmin/install_phpmyadmin_site.py
View file

@ -182,16 +182,16 @@ if args.path!='/':
</Location> \n\
".format(args.path[:-1], home_user, home_user, args.path[:-1])
base_name_file='{}-002-{}.conf'.format(args.domain, os.path.basename(args.path[1:-1]))
base_name_file='{}-{}.conf'.format(args.domain, os.path.basename(args.path[1:-1]))
name_file='/home/{}/{}-002-{}.conf'.format(system_user, args.domain, os.path.basename(args.path[1:-1]))
name_file='/home/{}/{}-{}.conf'.format(system_user, args.domain, os.path.basename(args.path[1:-1]))
with open(name_file, 'w') as f:
f.write(alias_apache)
print('Updating apache configuration for wordpress outside of htdocs...\n')
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra && sudo chown root:root /etc/{}/vhosts.d/extra/{}'.format(name_file, apache_cmd, apache_cmd, base_name_file), shell=True) > 0:
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra/proxyphp && sudo chown root:root /etc/{}/vhosts.d/extra/proxyphp/{}'.format(name_file, apache_cmd, apache_cmd, base_name_file), shell=True) > 0:
print('Error')
sys.exit(1)
@ -200,7 +200,7 @@ if args.path!='/':
print('Restarting apache...')
if subprocess.call('sudo '+apachectl+' configtest && sudo systemctl restart '+apache_cmd, shell=True) > 0:
subprocess.call('sudo rm /etc/{}/vhosts.d/extra/{}'.format(apache_cmd, base_name_file), shell=True)
subprocess.call('sudo rm /etc/{}/vhosts.d/extra/proxyphp/{}'.format(apache_cmd, base_name_file), shell=True)
print('Error: Error in configtest\n')
sys.exit(1)

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

@ -69,21 +69,25 @@ if args.path:
if path=='':
path='/'
apache_path='/proxy'
if path=='/':
name='proxy'
base_name_file='{}-001-{}.conf'.format(args.domain, name)
#base_name_file='{}-{}.conf'.format(args.domain, name)
name_file='/home/{}/{}-001-{}.conf'.format(system_user, args.domain, name)
#name_file='/home/{}/{}-{}.conf'.format(system_user, args.domain, name)
else:
apache_path=''
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)
base_name_file='{}-{}.conf'.format(args.domain, name)
name_file='/home/{}/{}-{}.conf'.format(system_user, args.domain, name)
with open(name_file, 'w') as f:
@ -126,7 +130,7 @@ with open(name_file, 'w') as f:
print('Updating apache configuration for application outside of htdocs...')
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra && sudo chown root:root /etc/{}/vhosts.d/extra/{}'.format(name_file, apache_cmd, apache_cmd, base_name_file), shell=True) > 0:
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra{} && sudo chown root:root /etc/{}/vhosts.d/extra{}/{}'.format(name_file, apache_cmd, apache_path, apache_cmd, apache_path, base_name_file), shell=True) > 0:
print('Error')
sys.exit(1)

4
scripts/webapps/wordpress/install_wordpress_site.py
View file

@ -155,14 +155,14 @@ if args.path!='/':
</Location> \n\
".format(args.path[:-1], home_user, home_user, args.path[:-1])
name_file='/home/{}/{}-002-{}.conf'.format(system_user, args.domain, os.path.basename(args.path[1:-1]))
name_file='/home/{}/{}-{}.conf'.format(system_user, args.domain, os.path.basename(args.path[1:-1]))
with open(name_file, 'w') as f:
f.write(alias_apache)
print('Updating apache configuration for wordpress outside of htdocs...')
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra'.format(name_file, apache_cmd), shell=True) > 0:
if subprocess.call('sudo mv {} /etc/{}/vhosts.d/extra/proxyphp'.format(name_file, apache_cmd), shell=True) > 0:
print('Error')
sys.exit(1)