From d647955196eef41eca742ccb725386b9d77b8912 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Tue, 22 Nov 2022 11:24:47 +0100
Subject: [PATCH] Change domains
---
containers/rustdesk.fish | 2 +-
volumes/nginx/conf.d/how-to-linux.mo8it.com.conf | 11 +++++++++++
volumes/nginx/conf.d/how-to-linux.mo8it.xyz.conf | 11 -----------
volumes/nginx/conf.d/juna-li.com.conf | 11 +++++++++++
volumes/nginx/conf.d/xueyue-li.art.conf | 11 -----------
volumes/nginx/conf.d/yinghong-massage.de.conf | 2 +-
volumes/traefik/traefik.yml | 4 +++-
7 files changed, 27 insertions(+), 25 deletions(-)
create mode 100644 volumes/nginx/conf.d/how-to-linux.mo8it.com.conf
delete mode 100644 volumes/nginx/conf.d/how-to-linux.mo8it.xyz.conf
create mode 100644 volumes/nginx/conf.d/juna-li.com.conf
delete mode 100644 volumes/nginx/conf.d/xueyue-li.art.conf
diff --git a/containers/rustdesk.fish b/containers/rustdesk.fish
index 7571fb5..dc72606 100755
--- a/containers/rustdesk.fish
+++ b/containers/rustdesk.fish
@@ -32,4 +32,4 @@ podman-default-create \
-v $container_s_volumes_dir:/root:Z \
--label "io.containers.autoupdate=registry" \
$image \
- hbbs -r mo8it.xyz:21117 -k _
+ hbbs -r mo8it.com:21117 -k _
diff --git a/volumes/nginx/conf.d/how-to-linux.mo8it.com.conf b/volumes/nginx/conf.d/how-to-linux.mo8it.com.conf
new file mode 100644
index 0000000..dff4faa
--- /dev/null
+++ b/volumes/nginx/conf.d/how-to-linux.mo8it.com.conf
@@ -0,0 +1,11 @@
+server {
+ listen 80;
+ server_name how-to-linux.mo8it.com;
+
+ location / {
+ root /volumes/sites/how-to-linux.mo8it.com;
+ index index.html;
+ }
+
+ error_page 404 /404.html;
+}
diff --git a/volumes/nginx/conf.d/how-to-linux.mo8it.xyz.conf b/volumes/nginx/conf.d/how-to-linux.mo8it.xyz.conf
deleted file mode 100644
index 2259d81..0000000
--- a/volumes/nginx/conf.d/how-to-linux.mo8it.xyz.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-server {
- listen 80;
- server_name how-to-linux.mo8it.xyz;
-
- location / {
- root /volumes/sites/how-to-linux.mo8it.xyz;
- index index.html;
- }
-
- error_page 404 /404.html;
-}
diff --git a/volumes/nginx/conf.d/juna-li.com.conf b/volumes/nginx/conf.d/juna-li.com.conf
new file mode 100644
index 0000000..fe2065c
--- /dev/null
+++ b/volumes/nginx/conf.d/juna-li.com.conf
@@ -0,0 +1,11 @@
+server {
+ listen 80;
+ server_name juna-li.com;
+
+ location / {
+ root /volumes/sites/juna-li.com;
+ index index.html;
+ }
+
+ error_page 404 /404.html;
+}
diff --git a/volumes/nginx/conf.d/xueyue-li.art.conf b/volumes/nginx/conf.d/xueyue-li.art.conf
deleted file mode 100644
index a3b0674..0000000
--- a/volumes/nginx/conf.d/xueyue-li.art.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-server {
- listen 80;
- server_name xueyue-li.art www.xueyue-li.art;
-
- location / {
- root /volumes/sites/xueyue-li.art;
- index index.html;
- }
-
- error_page 404 /404.html;
-}
diff --git a/volumes/nginx/conf.d/yinghong-massage.de.conf b/volumes/nginx/conf.d/yinghong-massage.de.conf
index acd5315..bc266e3 100644
--- a/volumes/nginx/conf.d/yinghong-massage.de.conf
+++ b/volumes/nginx/conf.d/yinghong-massage.de.conf
@@ -1,6 +1,6 @@
server {
listen 80;
- server_name yinghong-massage.de www.yinghong-massage.de;
+ server_name yinghong-massage.de;
location / {
root /volumes/sites/yinghong-massage.de;
diff --git a/volumes/traefik/traefik.yml b/volumes/traefik/traefik.yml
index 34b6cdf..b725ab1 100644
--- a/volumes/traefik/traefik.yml
+++ b/volumes/traefik/traefik.yml
@@ -15,9 +15,11 @@ entryPoints:
entryPoint:
to: websecure
scheme: https
-
websecure:
address: :443
+ http:
+ tls:
+ certResolver: le
certificatesResolvers:
le: