Update

2 files changed, 27 insertions, 27 deletions

diff --git a/nginx/sites-available/vps b/nginx/sites-available/vps
index bb470c6..270eea7 100644
--- a/nginx/sites-available/vps
+++ b/nginx/sites-available/vps
@@ -1,3 +1,8 @@
+# charset
+charset utf-8;
+charset_types *;
+override_charset on;
+
 #map $token $api_client_name {
 #    default "";
 #
@@ -15,21 +20,18 @@ map $uri $basename {
   ~/(?<captured_basename>[^/]*)$ $captured_basename;
 }
 
-# charset
-charset utf-8;
-charset_types *;
-override_charset on;
-
 server {
-  server_name topo.tw www.topo.tw;
+  server_name topo.tw;
 
   listen 80;
   listen 443 ssl;
   ssl_certificate /home/pham/.acme.sh/topo.tw_ecc/fullchain.cer;
   ssl_certificate_key /home/pham/.acme.sh/topo.tw_ecc/topo.tw.key;
-  location .well-known/ {
-    root /home/pham/Downloads/.well-known;
-  }
+
+  # LOG
+  error_page 404 /404.html;
+  error_log /var/log/nginx/error.log debug;
+  #rewrite_log on;
 
   # files
   root /srv/http;
@@ -38,22 +40,20 @@ server {
   #autoindex_exact_size off;
   disable_symlinks off;
 
+  # header
+  proxy_set_header Host $host;
+  add_header Cache-Control "no-cache" always;
+  #add_header Cache-Control "max-age=604800";
 
+  # paths for temporary usage
   include /etc/nginx/sites-available/topo.tw.tmp;
 
+  # config for fancyindex
   include /home/pham/site/nginx/modules/fancyindex/fancyindex.conf;
   location ^~ /fancyindex/ {
     root /home/pham/site/nginx/modules; 
   }
 
-  # header
-  proxy_set_header Host $host;
-  add_header Cache-Control "no-cache" always;
-  #add_header Cache-Control "max-age=604800";
-  error_page 404 /404.html;
-  error_log /var/log/nginx/error.log debug;
-  #rewrite_log on;
-
   try_files $uri $uri"index.html" $uri/index.html @rewrite_no_slash;
 
   location @rewrite_no_slash {
@@ -321,7 +321,7 @@ server {
   ssl_certificate /home/pham/.acme.sh/rb.topo.tw_ecc/fullchain.cer;
   ssl_certificate_key /home/pham/.acme.sh/rb.topo.tw_ecc/rb.topo.tw.key;
 
-  root /srv/riverbien;
+  root /srv/river;
 
   include /home/pham/site/nginx/modules/fancyindex/fancyindex.conf;
   fancyindex_default_sort date_desc;
@@ -331,6 +331,7 @@ server {
   fancyindex_ignore dist plugin .*png .*jpg ^\..*;
 
   add_header Cache-Control "no-cache" always;
+  add_header Access-Control-Allow-Origin * always;
 }
 
 # git server
@@ -409,7 +410,6 @@ server {
   add_header Access-Control-Allow-Origin * always;
 
   location / {
-    charset utf-8;
     autoindex on;
     autoindex_localtime on;
     autoindex_exact_size off;
@@ -431,11 +431,11 @@ server {
 }
 
 # FOR ACME.SH
-#server {
-#  server_name rb.topo.tw;
-#  root /home/pham/Downloads;
-#  listen 80;
-#}
+server {
+  server_name topo.tw www.topo.tw;
+  root /home/pham/Downloads;
+  listen 80;
+}
 
 # TODO, WORKING
 #server {
diff --git a/smtpd/smtpd.conf b/smtpd/smtpd.conf
index 52c2b56..321aee6 100644
--- a/smtpd/smtpd.conf
+++ b/smtpd/smtpd.conf
@@ -8,9 +8,9 @@
 
 smtp max-message-size 3G
 
-# Certificates from Let's Encrypt.
-pki mail.topo.tw cert "/etc/mail/ssl/fullchain.cer"
-pki mail.topo.tw key "/etc/mail/ssl/mail.topo.tw.key"
+# Certificates from ACME.sh
+pki mail.topo.tw cert "/home/pham/.acme.sh/mail.topo.tw_ecc/mail.topo.tw.cer"
+pki mail.topo.tw key "/home/pham/.acme.sh/mail.topo.tw_ecc/mail.topo.tw.key"
 
 # DKIM, command:
 #       sudo PIPX_HOME=/opt/pipx PIPX_BIN_DIR=/usr/local/bin pipx install --force git+https://github.com/palant/opensmtpd-filters.git