Merge branch 'main' of https://github.com/StepanovPlaton/HomeServerServices

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "homepage/src"]
+	path = homepage/src
+	url = https://github.com/StepanovPlaton/AboutMe

homepage/.env.example

@@ -0,0 +1,2 @@
+OAUTH_GITHUB_CLIENT_ID=
+OAUTH_GITHUB_CLIENT_SECRET=

homepage/docker-compose.yml

@@ -0,0 +1,18 @@
+services:
+  homepage:
+    container_name: homepage
+    restart: always
+    build:
+      context: src
+      args:
+        - OAUTH_GITHUB_CLIENT_ID=${OAUTH_GITHUB_CLIENT_ID:?}
+        - OAUTH_GITHUB_CLIENT_SECRET=${OAUTH_GITHUB_CLIENT_SECRET:?}
+    environment:
+      - NODE_ENV=production
+    networks:
+      - homepage_network
+
+networks:
+  homepage_network:
+    driver: bridge
+    name: homepage_network

memos/.env.example

@@ -0,0 +1 @@
+MEMOS_URL=https://todo.domain.ru

memos/docker-compose.yml

@@ -0,0 +1,16 @@
+services:
+  memos:
+    image: docker.io/neosmemo/memos:stable
+    container_name: memos
+    restart: always
+    volumes:
+      - ./memos:/var/opt/memos
+    environment:
+      - MEMOS_INSTANCE_URL=${MEMOS_URL:?}
+    networks:
+      - memos_network
+
+networks:
+  memos_network:
+    name: memos_network
+    driver: bridge

proxy/ddns/domains.txt.example

@@ -5,3 +5,4 @@ git
 cloud
 matrix
 chat
+todo

proxy/docker-compose.yml

@@ -25,6 +25,8 @@ services:
       - gitea_network
       - cloud_network
       - matrix_network
+      - memos_network
+      - homepage_network
 
   certbot:
     image: docker.io/certbot/certbot
@@ -77,3 +79,9 @@ networks:
   matrix_network:
     external: true
     name: matrix_network
+  memos_network:
+    external: true
+    name: memos_network
+  homepage_network:
+    external: true
+    name: homepage_network

proxy/nginx/conf.d/default.conf.example

@@ -23,10 +23,13 @@ server {
     ssl_certificate /etc/letsencrypt/live/domain.ru/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/domain.ru/privkey.pem;
 
+
     location / {
-        charset utf-8;
+        proxy_pass http://homepage:4321;
-        default_type text/plain;
+        proxy_set_header Host $host;
-        return 200 "Hello world!";
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
     }
 }
 
@@ -38,6 +41,11 @@ server {
     ssl_certificate /etc/letsencrypt/live/git.domain.ru/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/git.domain.ru/privkey.pem;
 
+    # Меняем домашнюю страницу на страницу админа
+    location = / {
+        return 301 /username;
+    }
+
     location / {
         proxy_pass http://gitea:3000;
         proxy_set_header Host $host;
@@ -101,3 +109,22 @@ server {
         client_max_body_size 50M;
     }
 }
+
+# Memos
+server {
+    listen 443 ssl;
+    server_name todo.domain.ru;
+
+    ssl_certificate /etc/letsencrypt/live/todo.domain.ru/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/todo.domain.ru/privkey.pem;
+
+    location / {
+        proxy_pass http://memos:5230;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        client_max_body_size 50M;
+    }
+}