diff --git a/web/utils/site.py b/web/utils/site.py index f9d0ace06..17e3febdb 100644 --- a/web/utils/site.py +++ b/web/utils/site.py @@ -1926,6 +1926,11 @@ location ^~ {from} {\n\ path = self.getHostConf(default_site) if os.path.exists(path): conf = mw.readFile(path) + rep = r"listen\s+443\s+quic\s*reuseport.+" + conf = re.sub(rep, 'listen 443 quic reuseport;', conf, 1) + rep = r"listen\s+\[\:\:\]\:443\s+quic\s*reuseport.+;" + conf = re.sub(rep, 'listen [::]:443 quic reuseport;', conf, 1) + rep = r"listen\s+80.+;" conf = re.sub(rep, 'listen 80;', conf, 1) rep = r"listen\s+\[\:\:\]\:80.+;" @@ -1936,8 +1941,6 @@ location ^~ {from} {\n\ conf = re.sub(rep, 'listen 443 quic;', conf, 1) rep = r"listen\s+\[\:\:\]\:443.+;" conf = re.sub(rep, 'listen [::]:443 ssl;', conf, 1) - rep = r"listen\s+\[\:\:\]\:443\s+quic\s*reuseport.+;" - conf = re.sub(rep, 'listen [::]:443 quic reuseport;', conf, 1) rep = r"listen\s+\[\:\:\]\:443\s+quic.+;" conf = re.sub(rep, 'listen [::]:443 quic;', conf, 1) mw.writeFile(path, conf) @@ -1945,6 +1948,12 @@ location ^~ {from} {\n\ path = self.getHostConf(name) if os.path.exists(path): conf = mw.readFile(path) + rep = r"listen\s+443\s*quic\s*reuseport\s*\w*\s*;" + conf = re.sub(rep, 'listen 443 quic reuseport default_server;', conf, 1) + + rep = r"listen\s+\[\:\:\]\:443\s*quic\s*reuseport\s*\w*\s*;" + conf = re.sub(rep, 'listen [::]:443 quic reuseport default_server;', conf, 1) + rep = r"listen\s+80\s*;" conf = re.sub(rep, 'listen 80 default_server;', conf, 1) rep = r"listen\s+\[\:\:\]\:80\s*\w*\s*;" @@ -1955,8 +1964,7 @@ location ^~ {from} {\n\ conf = re.sub(rep, 'listen 443 quic default_server;', conf, 1) rep = r"listen\s+\[\:\:\]\:443\s*ssl\s*\w*\s*;" conf = re.sub(rep, 'listen [::]:443 ssl default_server;', conf, 1) - rep = r"listen\s+\[\:\:\]\:443\s*quic\s*reuseport\s*\w*\s*;" - conf = re.sub(rep, 'listen [::]:443 quic reuseport default_server;', conf, 1) + rep = r"listen\s+\[\:\:\]\:443\s*quic\s*\w*\s*;" conf = re.sub(rep, 'listen [::]:443 quic default_server;', conf, 1) mw.writeFile(path, conf)