Compare commits
10 Commits
e5428868c7
...
a740afb5e2
Author | SHA1 | Date | |
---|---|---|---|
a740afb5e2 | |||
e073f07c39 | |||
85fc3a5083 | |||
02c80d06d6 | |||
0e5ca9b0a4 | |||
5cb26a0c0b | |||
34a70717b8 | |||
e4fd5749c3 | |||
c5992865fc | |||
b0f784596d |
25
.gitea/workflows/ci.yml
Normal file
25
.gitea/workflows/ci.yml
Normal file
@ -0,0 +1,25 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
- name: Install Docker
|
||||
run: curl -fsSL https://get.docker.com | sh
|
||||
|
||||
- name: Deploy with Docker
|
||||
run: docker compose up --build -d
|
||||
|
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
||||
[submodule "web"]
|
||||
path = web
|
||||
url = https://git.thehrz.net/thehrz/ipv6-test.git
|
||||
url = https://git.thehrz.net/thehrz/ipv6-test-frontend
|
||||
|
@ -19,7 +19,6 @@ services:
|
||||
container_name: ipv6-test-backend
|
||||
restart: always
|
||||
networks:
|
||||
- traefik
|
||||
- ipv6-test
|
||||
nginx:
|
||||
build: ./nginx
|
||||
@ -27,10 +26,9 @@ services:
|
||||
restart: always
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.ipv6-test.rule=Host(`ipv6-test.thehrz.net`)
|
||||
- traefik.http.routers.ipv6-test.rule=Host(`test.ipv6test.online`) || Host(`4.ipv6test.online`) || Host(`6.ipv6test.online`)
|
||||
- traefik.http.routers.ipv6-test.entrypoints=web,websecure
|
||||
- traefik.http.routers.ipv6-test.tls.certresolver=letsencrypt
|
||||
- traefik.http.services.ipv6-test.loadbalancer.server.port=3000
|
||||
networks:
|
||||
- traefik
|
||||
- ipv6-test
|
||||
|
20
nginx/conf.d/4.conf
Normal file
20
nginx/conf.d/4.conf
Normal file
@ -0,0 +1,20 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name 4.ipv6test.online;
|
||||
|
||||
gzip on;
|
||||
gzip_min_length 1k;
|
||||
gzip_buffers 4 16k;
|
||||
gzip_http_version 1.1;
|
||||
gzip_comp_level 9;
|
||||
gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/javascript application/json;
|
||||
gzip_disable "MSIE [1-6]\.";
|
||||
gzip_vary on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://ipv6-test-backend:8080/;
|
||||
proxy_read_timeout 60;
|
||||
proxy_connect_timeout 60;
|
||||
proxy_redirect off;
|
||||
}
|
||||
}
|
@ -1,11 +1,6 @@
|
||||
upstream backend {
|
||||
server backend:8080;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name ipv6.thehrz.net;
|
||||
server_name 6.ipv6test.online;
|
||||
|
||||
gzip on;
|
||||
gzip_min_length 1k;
|
||||
@ -17,13 +12,9 @@ server {
|
||||
gzip_vary on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://frontend:3000;
|
||||
proxy_pass http://ipv6-test-backend:8080/;
|
||||
proxy_read_timeout 60;
|
||||
proxy_connect_timeout 60;
|
||||
proxy_redirect off;
|
||||
}
|
||||
|
||||
location ^~ /api/ {
|
||||
proxy_pass http://backend/;
|
||||
}
|
||||
}
|
20
nginx/conf.d/root.conf
Normal file
20
nginx/conf.d/root.conf
Normal file
@ -0,0 +1,20 @@
|
||||
server {
|
||||
listen [::]:80;
|
||||
server_name ipv6test.online;
|
||||
|
||||
gzip on;
|
||||
gzip_min_length 1k;
|
||||
gzip_buffers 4 16k;
|
||||
gzip_http_version 1.1;
|
||||
gzip_comp_level 9;
|
||||
gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/javascript application/json;
|
||||
gzip_disable "MSIE [1-6]\.";
|
||||
gzip_vary on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://ipv6-test-frontend:3000;
|
||||
proxy_read_timeout 60;
|
||||
proxy_connect_timeout 60;
|
||||
proxy_redirect off;
|
||||
}
|
||||
}
|
18
nginx/conf.d/test.conf
Normal file
18
nginx/conf.d/test.conf
Normal file
@ -0,0 +1,18 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name test.ipv6test.online;
|
||||
|
||||
gzip on;
|
||||
gzip_min_length 1k;
|
||||
gzip_buffers 4 16k;
|
||||
gzip_http_version 1.1;
|
||||
gzip_comp_level 9;
|
||||
gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/javascript application/json;
|
||||
gzip_disable "MSIE [1-6]\.";
|
||||
gzip_vary on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://ipv6-test-backend:8080/;
|
||||
}
|
||||
}
|
2
web
2
web
@ -1 +1 @@
|
||||
Subproject commit fe04e92e04edc6faefa87a3121cc287544df32bd
|
||||
Subproject commit a6b4fe0222e873bb27ee28f20cb6c1d4f02c0e51
|
Loading…
Reference in New Issue
Block a user