sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

curl text fixes

Browse Source
This commit is contained in:
Zsolt Ero
2024-09-11 02:31:32 +02:00
parent 78f003e6e3
commit 793d1b81c3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/http_host/http_host_lib/nginx.py
View File

@@ -90,7 +90,12 @@ def write_nginx_config():
subprocess.run(['nginx', '-t'], check=True) subprocess.run(['nginx', '-t'], check=True)
subprocess.run(['systemctl', 'reload', 'nginx'], check=True) subprocess.run(['systemctl', 'reload', 'nginx'], check=True)
print(curl_text_mix) curl_text_lines = sorted(curl_text_mix.splitlines())
if '/monaco' in curl_text_mix:
curl_text_lines = [l for l in curl_text_lines if '/monaco' not in l]
curl_text_mix = '\n'.join(curl_text_lines)
print(f'test with:\n{curl_text_mix}')
def create_nginx_conf(*, template_path, local, domain): def create_nginx_conf(*, template_path, local, domain):
@@ -115,7 +120,7 @@ def create_nginx_conf(*, template_path, local, domain):
def create_location_blocks(*, local, domain): def create_location_blocks(*, local, domain):
location_str = '' location_str = ''
curl_text = 'test with:\n' curl_text = ''
for subdir in config.mnt_dir.iterdir(): for subdir in config.mnt_dir.iterdir():
if not subdir.is_dir(): if not subdir.is_dir():
@@ -133,7 +138,7 @@ def create_location_blocks(*, local, domain):
]: ]:
curl_text += ( curl_text += (
# f'curl -H "Host: __LOCAL__" -I http://localhost/{path}\n' # f'curl -H "Host: __LOCAL__" -I http://localhost/{path}\n'
f'curl -I https://__DOMAIN__{path}\n' f'curl -sI https://__DOMAIN__{path} | sort\n'
) )
location_str += create_latest_locations(local=local, domain=domain) location_str += create_latest_locations(local=local, domain=domain)
@@ -147,7 +152,7 @@ def create_location_blocks(*, local, domain):
]: ]:
curl_text += ( curl_text += (
# f'curl -H "Host: __LOCAL__" -I http://localhost/{path}\n' # f'curl -H "Host: __LOCAL__" -I http://localhost/{path}\n'
f'curl -I https://__DOMAIN__{path}\n' f'curl -sI https://__DOMAIN__{path} | sort\n'
) )
with open(config.nginx_confs / 'location_static.conf') as fp: with open(config.nginx_confs / 'location_static.conf') as fp: