summaryrefslogtreecommitdiffstats
path: root/usr/local/etc/nginx/nginx.conf
diff options
context:
space:
mode:
Diffstat (limited to 'usr/local/etc/nginx/nginx.conf')
-rw-r--r--usr/local/etc/nginx/nginx.conf60
1 files changed, 35 insertions, 25 deletions
diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf
index 904604c..cb034ba 100644
--- a/usr/local/etc/nginx/nginx.conf
+++ b/usr/local/etc/nginx/nginx.conf
@@ -52,11 +52,13 @@ http {
listen 443 ssl; # managed by Certbot
- ssl_certificate /usr/local/etc/letsencrypt/live/jozanofastora.xyz-0001/fullchain.pem; # managed by Certbot
- ssl_certificate_key /usr/local/etc/letsencrypt/live/jozanofastora.xyz-0001/privkey.pem; # managed by Certbot
+ ssl_certificate /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/fullchain.pem; # managed by Certbot
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/privkey.pem; # managed by Certbot
include /usr/local/etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+
}
server{
@@ -71,22 +73,6 @@ http {
location ~ /\.ht {
deny all;
}
-# location @jozan {
-# include fastcgi_params;
-# root /usr/local/www/gitjoe/jozan;
-# try_files $uri @jozan;
-# index cgit.cgi;
-# fastcgi_param SCRIPT_FILENAME $document_root/cgit.cgi;
-# fastcgi_param PATH_INFO $uri;
-# fastcgi_param QUERY_STRING $args;
-# fastcgi_param HTTP_HOST $server_name;
-# fastcgi_param CGIT_CONFIG /usr/local/etc/cgitusers/jozan;
-# fastcgi_pass unix:/var/run/fcgiwrap/fcgiwrap.sock;
-#
-# gzip off;
-# #rewrite ^ https://$server_name$request_uri permanent;
-# rewrite ^/([^/]+/.*)?$ /cgit.cgi?url=$1 break;
-# }
error_page 403 /403.html;
location = /403.html {
root /usr/local/www/gitjoe/err;
@@ -102,16 +88,18 @@ http {
listen 443 ssl; # managed by Certbot
- ssl_certificate /usr/local/etc/letsencrypt/live/jozanofastora.xyz-0001/fullchain.pem; # managed by Certbot
- ssl_certificate_key /usr/local/etc/letsencrypt/live/jozanofastora.xyz-0001/privkey.pem; # managed by Certbot
+ ssl_certificate /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/fullchain.pem; # managed by Certbot
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/privkey.pem; # managed by Certbot
include /usr/local/etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+
+
}
server {
- listen 80;
server_name repos.gitjoe.xyz;
root /usr/local/www/cgit;
try_files $uri @cgit;
@@ -135,7 +123,14 @@ http {
root /usr/local/www/nginx-dist;
}
- }
+
+ listen 443 ssl; # managed by Certbot
+ ssl_certificate /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/fullchain.pem; # managed by Certbot
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/privkey.pem; # managed by Certbot
+ include /usr/local/etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
+ ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
+
+}
server {
server_name fossil.jozanofastora.xyz;
@@ -166,14 +161,29 @@ http {
listen 443 ssl; # managed by Certbot
- ssl_certificate /usr/local/etc/letsencrypt/live/jozanofastora.xyz-0001/fullchain.pem; # managed by Certbot
- ssl_certificate_key /usr/local/etc/letsencrypt/live/jozanofastora.xyz-0001/privkey.pem; # managed by Certbot
+ ssl_certificate /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/fullchain.pem; # managed by Certbot
+ ssl_certificate_key /usr/local/etc/letsencrypt/live/git.jozanofastora.xyz/privkey.pem; # managed by Certbot
include /usr/local/etc/letsencrypt/options-ssl-nginx.conf; # managed by Ce/srvrtbot
ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem; # managed by Cert/srvbot
- }
+
+}
+
+
+
+server {
+ if ($host = repos.gitjoe.xyz) {
+ return 301 https://$host/?p=about;
+ } # managed by Certbot
+ listen 80;
+ server_name repos.gitjoe.xyz;
+ return 404; # managed by Certbot
+
+
+}
+
server{
if ($host = git.jozanofastora.xyz) {
return 301 https://gitjoe.xyz$request_uri;