diff options
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/etc/cgitrc | 2 | ||||
| -rw-r--r-- | usr/local/etc/nginx/nginx.conf | 22 | ||||
| -rw-r--r-- | usr/local/etc/pf.conf | 10 |
3 files changed, 15 insertions, 19 deletions
diff --git a/usr/local/etc/cgitrc b/usr/local/etc/cgitrc index 2337d6c..ef18d5b 100644 --- a/usr/local/etc/cgitrc +++ b/usr/local/etc/cgitrc @@ -39,7 +39,7 @@ repository-sort=name local-time=0 strict-export=git-daemon-export-ok remove-suffix=1 -side-by-side-diffs=1 +side-by-side-diffs=0 section-sort=1 section-from-path=1 diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf index acc23ac..e3a4915 100644 --- a/usr/local/etc/nginx/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf @@ -109,10 +109,6 @@ http { scgi_param SCRIPT_NAME "/code"; scgi_pass 127.0.0.1:12345; } - - listen 443 ssl; - ssl_certificate /usr/local/etc/letsencrypt/live/gitjoe.xyz/fullchain.pem; - ssl_certificate_key /usr/local/etc/letsencrypt/live/gitjoe.xyz/privkey.pem; } server{ @@ -135,15 +131,15 @@ server{ return 404; } -server { - if ($host = fossil.jozanofastora.xyz) { - return 301 https://$host$request_uri; - } - - server_name fossil.jozanofastora.xyz; - listen 80; - return 404; -} +#server { +# if ($host = fossil.jozanofastora.xyz) { +# return 301 https://$host$request_uri; +# } +# +# server_name fossil.jozanofastora.xyz; +# listen 80; +# return 404; +#} server { server_name www.jozanofastora.xyz; diff --git a/usr/local/etc/pf.conf b/usr/local/etc/pf.conf index 1838656..c514fe8 100644 --- a/usr/local/etc/pf.conf +++ b/usr/local/etc/pf.conf @@ -10,7 +10,7 @@ table <spamd> persist table <spamd-allow> persist # Allowed webmail services -table <webmail> persist file "/usr/local/etc/pf.webmail.ip.conf" +#table <webmail> persist file "/usr/local/etc/pf.webmail.ip.conf" ## Skip loop back interface - Skip all PF processing on interface ## set skip on lo @@ -23,16 +23,16 @@ scrub in all # Pass spamd allow list -pass quick log on $ext_if inet proto tcp from <spamd-allow> to $ext_if port smtp \ +rdr pass log on $ext_if inet proto tcp from <spamd-allow> to $ext_if port smtp \ -> 127.0.0.1 port 25 # Pass webmail servers -rdr pass quick log on $ext_if inet proto tcp from <gmail> to $ext_if port smtp \ +rdr pass log on $ext_if inet proto tcp from <gmail> to $ext_if port smtp \ -> 127.0.0.1 port 25 # pass submission messages. pass quick log on $ext_if inet proto tcp from any to $ext_if port submission modulate state # Pass unknown mail to spamd rdr pass log on $ext_if inet proto tcp from {!<spamd-allow> <spamd>} to $ext_if port smtp \ - -> 127.0.0.1 port 8025 + -> 127.0.0.1 port 8025 ## Blocking spoofed packets antispoof quick for $ext_if @@ -57,4 +57,4 @@ pass quick on $ext_if proto tcp from any to any port {imap, imaps, pop3, pop3s} # Allow outgoing traffic pass out on $ext_if proto tcp from any to any modulate state pass out on $ext_if proto udp from any to any keep state -pass quick on $ext_if from any to any port http +#pass quick on $ext_if from any to any port http |