pascal/server_proxy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: pascal:trunk
Branches Tags
pascal:pdev pascal:trunk
...
pull from: pascal:pdev
Branches Tags
pascal:pdev pascal:trunk

6 Commits
trunk ... pdev

Author SHA1 Message Date
Pascal
f8a61b11ea [CP][mod] switched nginx to stable-alpine and updated certbot to 1.16.0 
(cherry picked from commit da5642b80f)
 2021-07-02 16:04:15 -04:00
Pascal
b960cb5acf [CP][mod] added regex to strip port from upstream name in html files 
(cherry picked from commit e4d912106d)
 2021-02-28 12:10:09 -05:00
Pascal
0a23303f66 [add] added custom location for swager-ui in ryndns_demo 2021-02-28 04:09:37 -05:00
Pascal
10b8cf6487 [CP][fix] fixed page title of error pages to be var based in web container 
(cherry picked from commit e16eb6746f)
 2021-02-28 01:35:19 -05:00
Pascal
45a283aedc [CP][fix] fixed wrong ports for proxy 
(cherry picked from commit 229827d525)
 2021-02-28 00:33:45 -05:00
Pascal
0caad13abe [add] added pdev domains 2021-02-27 21:20:04 -05:00
15 changed files with 113 additions and 46 deletions
Expand all files Collapse all files

2
certbot/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM certbot/certbot:v1.12.0
FROM certbot/certbot:v1.16.0
ARG USER_UUID=12000
ARG USER_GUID=12000

4
docker-compose.yml
View File

@@ -17,8 +17,8 @@ services:
image: proxy
container_name: proxy
ports:
- "9980:8080"
- "9443:8443"
- "80:8080"
- "443:8443"
networks:
- service_web
- service_certbot

4
files/domains.env
View File

@@ -1,5 +1,5 @@
# domains are seperated with \n
DOMAINS=example.com www api test
DOMAINS=pdev.dev www\ngit.pdev.dev\napi.pdev.dev\ndemo.api.pdev.dev
# server values are seperated with ' ' (space) (one server per domain)
# port can be appended, default is 8080 if ommited
SERVER=web:8080
SERVER=web gitea:3000 ryndns:3000 ryndns_demo:3000

28
files/upstream_configs/ryndns_demo.conf Normal file
View File

@@ -0,0 +1,28 @@
location / {
set $swager swager-ui:8080;
# allow for upstream to be offline by setting
# docker dns resolver and a variable for the server
resolver 127.0.0.11 valid=30s;
proxy_pass http://$swager;
proxy_redirect off;
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-Host $server_name;
proxy_set_header X-Forwarded-Upstream $swager;
}
location /rynDNS {
# allow for upstream to be offline by setting
# docker dns resolver and a variable for the server
resolver 127.0.0.11 valid=30s;
proxy_pass http://$upstream;
proxy_redirect off;
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-Host $server_name;
proxy_set_header X-Forwarded-Upstream $upstream;
}

2
proxy/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM nginx:1.18-alpine
FROM nginx:stable-alpine
ARG USER_UUID=12000
ARG USER_GUID=12000

10
proxy/files/html/errors/error.html
View File

@@ -7,15 +7,19 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

10
proxy/files/html/errors/error_403.html
View File

@@ -7,15 +7,19 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

10
proxy/files/html/errors/error_404.html
View File

@@ -7,15 +7,19 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

10
proxy/files/html/errors/error_50x.html
View File

@@ -7,7 +7,7 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
@@ -15,9 +15,13 @@
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

2
web/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM nginx:1.18-alpine
FROM nginx:stable-alpine
ARG USER_UUID=12000
ARG USER_GUID=12000

10
web/files/html/errors/error.html
View File

@@ -7,15 +7,19 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

10
web/files/html/errors/error_403.html
View File

@@ -7,15 +7,19 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

10
web/files/html/errors/error_404.html
View File

@@ -7,15 +7,19 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

10
web/files/html/errors/error_50x.html
View File

@@ -7,7 +7,7 @@
<link href="/0x90/css/blink.css" rel="stylesheet">
<link href="/0x90/css/main.css" rel="stylesheet">
<meta charset="utf-8">
<title>pdev Studio</title>
<title><!--# echo var="server_domain" default="some" --></title>
</head>
<body>
@@ -15,9 +15,13 @@
<div class="pure-g">
<div class="pure-u-1-1">
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="pdev" --></div>
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="Studio" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>

11
web/files/html/index.html
View File

@@ -16,7 +16,11 @@
<div class="logo">
<div class="left"><!--# echo var="server_domain" default="some" --></div>
<div class="hash">#</div>
<div class="right"><!--# echo var="upstream" default="website" --></div>
<div class="right">
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
</div>
</div>
<div class="pure-u-1-1"></div>
@@ -24,7 +28,10 @@
<div class="pure-g">
<div class="pure-u-1-1 code">0x2A</div>
<div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
(1/42) installing <!--# echo var="upstream" default="website" -->
(1/42) installing
<!--# if expr="$upstream = /(?P<server_name>[^:]*)/" -->
<!--# echo var="server_name" default="website" -->
<!--# endif -->
</div>
<div class="pure-u-1-1 pure-u-md-1-2 center-elements msg">
[######