diff --git a/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py b/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py index de09824..6751313 100644 --- a/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py +++ b/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py @@ -129,7 +129,19 @@ def get_proxy_endpoints() -> Dict[str, ProxyEndpoint]: "ssl_keyfile", help=("SSL key file path."), ) -def main(output_file_path: str, ssl_certfile: str, ssl_keyfile: str) -> None: +@click.option( + "--listen-address", + "listen_address", + help=("nginx listen address."), +) +@click.option( + "--log-dir", + "log_dir", + help=("skyline log file address."), +) +def main( + output_file_path: str, ssl_certfile: str, ssl_keyfile: str, listen_address: str, log_dir: str +) -> None: try: configure("skyline") setup(StreamHandler(), debug=CONF.default.debug) @@ -150,7 +162,11 @@ def main(output_file_path: str, ssl_certfile: str, ssl_keyfile: str) -> None: if ssl_certfile: context.update(ssl_certfile=ssl_certfile) if ssl_keyfile: - context.update(ssl_certfile=ssl_keyfile) + context.update(ssl_keyfile=ssl_keyfile) + if listen_address: + context.update(listen_address=listen_address) + if log_dir: + context.update(log_dir=log_dir) result = template.render(**context) if output_file_path: diff --git a/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 b/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 index 230257a..e647fdf 100644 --- a/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 +++ b/libs/skyline-nginx/skyline_nginx/templates/nginx.conf.j2 @@ -44,8 +44,8 @@ http { '"$upstream_response_time" "$request" ' '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/kolla/skyline/nginx_access.log main; - error_log /var/log/kolla/skyline/nginx_error.log; + access_log {{ log_dir | default('/var/log/kolla/') }}skyline/nginx_access.log main; + error_log {{ log_dir | default('/var/log/kolla/') }}skyline/nginx_error.log; ## # Gzip Settings @@ -69,7 +69,7 @@ http { # Virtual Host Configs ## server { - listen 9999 ssl http2 default_server; + listen {{ listen_address | default('0.0.0.0:9999') }} ssl http2 default_server; root {{ skyline_console_static_path }};