From dc5b9db7ff94b42729dee901ce7dd3ebba849431 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 20 Oct 2021 23:43:09 +0200 Subject: [PATCH] Add a few more location blocks generators --- sysadmin/nginx-new-site.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sysadmin/nginx-new-site.py b/sysadmin/nginx-new-site.py index 0c94dc9..b5fb268 100644 --- a/sysadmin/nginx-new-site.py +++ b/sysadmin/nginx-new-site.py @@ -2,7 +2,8 @@ from pathlib import Path -from nginx.config.api import Section, Location, EmptyBlock, Comment, KeyValueOption, KeyMultiValueOption +from nginx.config.api import (Section, Location, EmptyBlock, Comment, + KeyValueOption, Block) from nginx.config.helpers import duplicate_options PROXY_OPTIONS = [ @@ -75,13 +76,23 @@ class NginxSiteBuilder: return self._config def write(self, path: Path): - destination = Path / self.filename + destination = path / self.filename with destination.open("w") as handle: handle.write(str(self._config)) - def add_logging(self, suffix="nginx_"): + def add_upstream(self, name="server", host="127.0.0.1", port=5555): + upstream = Block(f"upstream %{name}", server=f"{host}:{port}") + upstream.sections.add(self._config) + self._config = upstream - syslog = f"syslog:server=unix:/dev/log,tag={self.domain}_nginx," + def add_logging(self, suffix="nginx"): + + if isinstance(self.domain, list): + domain = self.domain[0].replace(".", "_") + else: + domain = domain.replace(".", "_") + + syslog = f"syslog:server=unix:/dev/log,tag={domain}_{suffix}," access = syslog + "severity=info,nohostname" error = syslog + "severity=error,nohostname" @@ -138,3 +149,12 @@ class NginxSiteBuilder: location.sections.add(duplicate_options("fastcgi_param", FPM_OPTIONS)) self._config.sections.add(location) + + def add_uwsgi_location(self, location="/", socket=None, auth=False): + + location = Location(location, uwsgi_pass=socket, + include="uwsgi_params") + if auth: + location.sections.add(KeyValueOption("include", "auth.conf")) + + self._config.sections.add(location)