diff options
| author | crupest <crupest@outlook.com> | 2022-11-19 17:35:41 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-11-19 17:35:41 +0800 |
| commit | 8e9dd42976020d501c6fb02fc67a0f4e93a5c96b (patch) | |
| tree | e29a4c2ca46103f6ba29a424b3b208f26534551f | |
| parent | a1bd1a5edf58458b9058b170cdd9cb091ddf629c (diff) | |
| download | crupest-8e9dd42976020d501c6fb02fc67a0f4e93a5c96b.tar.gz crupest-8e9dd42976020d501c6fb02fc67a0f4e93a5c96b.tar.bz2 crupest-8e9dd42976020d501c6fb02fc67a0f4e93a5c96b.zip | |
Fix nginx generation issue.
| -rwxr-xr-x | tool/aio.py | 5 | ||||
| -rw-r--r-- | tool/modules/configfile.py | 4 | ||||
| -rwxr-xr-x | tool/modules/nginx.py | 3 | ||||
| -rw-r--r-- | tool/modules/path.py | 3 | ||||
| -rw-r--r-- | tool/modules/template.py | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/tool/aio.py b/tool/aio.py index 6defa99..953f852 100755 --- a/tool/aio.py +++ b/tool/aio.py @@ -103,6 +103,11 @@ def download_tools(): def generate_nginx_config(domain: str) -> None: + console.print( + "I have found following var in nginx templates:", style="green") + for var in nginx_var_set: + console.print(var, end=" ", style="magenta") + console.print() if not os.path.exists(nginx_config_dir): os.mkdir(nginx_config_dir) console.print( diff --git a/tool/modules/configfile.py b/tool/modules/configfile.py index 49f2200..6752e58 100644 --- a/tool/modules/configfile.py +++ b/tool/modules/configfile.py @@ -39,7 +39,3 @@ def config_to_str(config: dict) -> str: def print_config(console, config: dict) -> None: for key, value in config.items(): console.print(f"[magenta]{key}[/] = [cyan]{value}") - - -__all__ = ["config_file_exist", "parse_config", - "get_domain", "config_to_str", "print_config"] diff --git a/tool/modules/nginx.py b/tool/modules/nginx.py index bf758b2..39b6c17 100755 --- a/tool/modules/nginx.py +++ b/tool/modules/nginx.py @@ -23,6 +23,9 @@ static_file_template = Template(os.path.join( reverse_proxy_template = Template(os.path.join( nginx_template_dir, 'reverse-proxy.conf.template')) +nginx_var_set = set.union(root_template.var_set, + static_file_template.var_set, reverse_proxy_template.var_set) + def nginx_config_gen(domain: str, dest: str) -> None: if not os.path.isdir(dest): diff --git a/tool/modules/path.py b/tool/modules/path.py index 24df27a..5d9aa3a 100644 --- a/tool/modules/path.py +++ b/tool/modules/path.py @@ -9,6 +9,3 @@ data_dir = os.path.join(project_dir, "data") tool_dir = os.path.join(project_dir, "tool") config_file_path = os.path.join(data_dir, "config") nginx_config_dir = os.path.join(project_dir, "nginx-config") - -__all__ = ["script_dir", "project_dir", "project_abs_path", "template_dir", - "nginx_template_dir", "data_dir", "config_file_path", "tool_dir", "nginx_config_dir"] diff --git a/tool/modules/template.py b/tool/modules/template.py index 444fbac..9747af1 100644 --- a/tool/modules/template.py +++ b/tool/modules/template.py @@ -28,5 +28,5 @@ class Template: if var not in config: raise ValueError(f"Missing config var {var}.") result = result.replace("$" + var, config[var]) - re.sub(r"\$\{\s*" + var + r"\s*\}", config[var], result) + result = re.sub(r"\$\{\s*" + var + r"\s*\}", config[var], result) return result |