From 2cd31be8daae91c48437e8332630bcd1a95e6731 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 30 Aug 2021 09:29:53 +0200 Subject: [PATCH] all: move domains.conf => sourcehut.conf --- builds.sr.ht.conf | 6 ++++-- dispatch.sr.ht.conf | 6 ++++-- git.sr.ht.conf | 6 ++++-- hg.sr.ht.conf | 6 ++++-- hub.sr.ht.conf | 6 ++++-- lists.sr.ht.conf | 6 ++++-- man.sr.ht.conf | 6 ++++-- meta.sr.ht.conf | 6 ++++-- nginx.conf | 2 -- paste.sr.ht.conf | 6 ++++-- domains.conf => sourcehut.conf | 2 ++ todo.sr.ht.conf | 6 ++++-- 12 files changed, 42 insertions(+), 22 deletions(-) rename domains.conf => sourcehut.conf (89%) diff --git a/builds.sr.ht.conf b/builds.sr.ht.conf index dd16c85..8bc1be8 100644 --- a/builds.sr.ht.conf +++ b/builds.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $buildssrht; + include sourcehut.conf; include port80.conf; + server_name $buildssrht; } server { - server_name $buildssrht; + include sourcehut.conf; include port443.conf; + server_name $buildssrht; ssl_certificate /etc/ssl/uacme/$buildssrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$buildssrht/key.pem; diff --git a/dispatch.sr.ht.conf b/dispatch.sr.ht.conf index 341089c..a662129 100644 --- a/dispatch.sr.ht.conf +++ b/dispatch.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $dispatchsrht; + include sourcehut.conf; include port80.conf; + server_name $dispatchsrht; } server { - server_name $dispatchsrht; + include sourcehut.conf; include port443.conf; + server_name $dispatchsrht; ssl_certificate /etc/ssl/uacme/$dispatchsrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$dispatchsrht/key.pem; diff --git a/git.sr.ht.conf b/git.sr.ht.conf index 2ed253c..405d3b7 100644 --- a/git.sr.ht.conf +++ b/git.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $gitsrht; + include sourcehut.conf; include port80.conf; + server_name $gitsrht; } server { - server_name $gitsrht; + include sourcehut.conf; include port443.conf; + server_name $gitsrht; ssl_certificate /etc/ssl/uacme/$gitsrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$gitsrht/key.pem; diff --git a/hg.sr.ht.conf b/hg.sr.ht.conf index 1fe1319..a4a8f58 100644 --- a/hg.sr.ht.conf +++ b/hg.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $hgsrht; + include sourcehut.conf; include port80.conf; + server_name $hgsrht; } server { - server_name $hgsrht; + include sourcehut.conf; include port443.conf; + server_name $hgsrht; ssl_certificate /etc/ssl/uacme/$hgsrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$hgsrht/key.pem; diff --git a/hub.sr.ht.conf b/hub.sr.ht.conf index 4365232..c27d135 100644 --- a/hub.sr.ht.conf +++ b/hub.sr.ht.conf @@ -1,6 +1,7 @@ server { - server_name $hubsrht; + include sourcehut.conf; include port80.conf; + server_name $hubsrht; # Redirect for legacy.sr.ht location ~ ^/[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$ { @@ -9,8 +10,9 @@ server { } server { - server_name $hubsrht; + include sourcehut.conf; include port443.conf; + server_name $hubsrht; ssl_certificate /etc/ssl/uacme/$hubsrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$hubsrht/key.pem; diff --git a/lists.sr.ht.conf b/lists.sr.ht.conf index 2c17315..5e71ba7 100644 --- a/lists.sr.ht.conf +++ b/lists.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $listssrht; + include sourcehut.conf; include port80.conf; + server_name $listssrht; } server { - server_name $listssrht; + include sourcehut.conf; include port443.conf; + server_name $listssrht; ssl_certificate /etc/ssl/uacme/$listssrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$listssrht/key.pem; diff --git a/man.sr.ht.conf b/man.sr.ht.conf index 6aa0350..f05a6e3 100644 --- a/man.sr.ht.conf +++ b/man.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $mansrht; + include sourcehut.conf; include port80.conf; + server_name $mansrht; } server { - server_name $mansrht; + include sourcehut.conf; include port443.conf; + server_name $mansrht; ssl_certificate /etc/ssl/uacme/$mansrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$mansrht/key.pem; diff --git a/meta.sr.ht.conf b/meta.sr.ht.conf index da3ee0c..d2b6dde 100644 --- a/meta.sr.ht.conf +++ b/meta.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $metasrht; + include sourcehut.conf; include port80.conf; + server_name $metasrht; } server { - server_name $metasrht; + include sourcehut.conf; include port443.conf; + server_name $metasrht; ssl_certificate /etc/ssl/uacme/$metasrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$metasrht/key.pem; diff --git a/nginx.conf b/nginx.conf index fa5666a..46beeef 100644 --- a/nginx.conf +++ b/nginx.conf @@ -29,7 +29,5 @@ http { access_log /var/log/nginx/access.log main; - set $python = "python3.9"; - include domains.conf; include /etc/nginx/http.d/*.conf; } diff --git a/paste.sr.ht.conf b/paste.sr.ht.conf index eaa63e2..b86b69c 100644 --- a/paste.sr.ht.conf +++ b/paste.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $pastesrht pasta.sr.ht; + include sourcehut.conf; include port80.conf; + server_name $pastesrht pasta.sr.ht; } server { - server_name $pastesrht pasta.sr.ht; + include sourcehut.conf; include port443.conf; + server_name $pastesrht pasta.sr.ht; ssl_certificate /etc/ssl/uacme/$pastesrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$pastesrht/key.pem; diff --git a/domains.conf b/sourcehut.conf similarity index 89% rename from domains.conf rename to sourcehut.conf index 3bae7d6..4d05717 100644 --- a/domains.conf +++ b/sourcehut.conf @@ -11,4 +11,6 @@ set $metasrht = "meta.sr.ht"; set $pastesrht = "paste.sr.ht"; set $todosrht = "todo.sr.ht"; +# Additional config variables set $private_network = "173.195.146.128/25"; +set $python = "python3.9"; diff --git a/todo.sr.ht.conf b/todo.sr.ht.conf index fcf4636..03d60c9 100644 --- a/todo.sr.ht.conf +++ b/todo.sr.ht.conf @@ -1,11 +1,13 @@ server { - server_name $todosrht; + include sourcehut.conf; include port80.conf; + server_name $todosrht; } server { - server_name $todosrht; + include sourcehut.conf; include port443.conf; + server_name $todosrht; ssl_certificate /etc/ssl/uacme/$todosrht/cert.pem; ssl_certificate_key /etc/ssl/uacme/private/$todosrht/key.pem;